diff --git a/.angulardoc.json b/.angulardoc.json index 2fdc8cde4..a8863e174 100644 --- a/.angulardoc.json +++ b/.angulardoc.json @@ -1,4 +1,4 @@ { - "repoId": "a13b5f05-f1dd-4d04-8f3d-e764621ce5c2", - "lastSync": 0 -} \ No newline at end of file + "repoId": "a13b5f05-f1dd-4d04-8f3d-e764621ce5c2", + "lastSync": 0 +} diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..0ced6c3c4 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,8 @@ +package.json +package-lock.json +dist +.angulardoc.json +.vscode/* +.history/* +node_modules/* +src/assets diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..764608e1b --- /dev/null +++ b/.prettierrc @@ -0,0 +1,8 @@ +{ + "bracketSpacing": true, + "semi": true, + "singleQuote": true, + "trailingComma": "none", + "printWidth": 120, + "disableLanguages": ["html"] +} diff --git a/.travis.yml b/.travis.yml index ab9dc2a2a..45dda3d41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: node_js node_js: - - '9' - - '10' + - '9' + - '10' install: - - npm install + - npm install script: - - npm run test-ci + - npm run test-ci cache: - directories: - - node_modules + directories: + - node_modules diff --git a/README.md b/README.md index 3bb755f74..84d308dc1 100644 --- a/README.md +++ b/README.md @@ -18,16 +18,16 @@ Provides fast, reliable and extensible starter for the development of Angular pr `sb-admin-bs4-angular9` provides the following features: -* Developed using boostrap-v6.0.0 -* angular-v9.0.2 -* angular/cli-v9.0.2 -* [ng-bootstrap-v6.0.0](https://github.com/ng-bootstrap/) -* [ngx-translate-v12.1.1](https://github.com/ngx-translate) -* Following the best practices. -* Ahead-of-Time compilation support. -* Official Angular i18n support. -* Production and development builds. -* Tree-Shaking production builds. +- Developed using boostrap-v6.0.0 +- angular-v9.0.2 +- angular/cli-v9.0.2 +- [ng-bootstrap-v6.0.0](https://github.com/ng-bootstrap/) +- [ngx-translate-v12.1.1](https://github.com/ngx-translate) +- Following the best practices. +- Ahead-of-Time compilation support. +- Official Angular i18n support. +- Production and development builds. +- Tree-Shaking production builds. ### How to start diff --git a/angular.json b/angular.json index 04dc26685..afa836fd7 100644 --- a/angular.json +++ b/angular.json @@ -1,148 +1,125 @@ { - "$schema": "./node_modules/@angular/cli/lib/config/schema.json", - "version": 1, - "newProjectRoot": "projects", - "projects": { - "test-ng7": { - "root": "", - "sourceRoot": "src", - "projectType": "application", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", - "options": { - "outputPath": "dist", - "index": "src/index.html", - "main": "src/main.ts", - "tsConfig": "src/tsconfig.app.json", - "polyfills": "src/polyfills.ts", - "assets": [ - "src/assets", - "src/favicon.ico" - ], - "styles": [ - "node_modules/font-awesome/css/font-awesome.css", - "src/styles/app.scss" - ], - "scripts": [ - "node_modules/chart.js/dist/Chart.js" - ] - }, - "configurations": { - "production": { - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" + "$schema": "./node_modules/@angular/cli/lib/config/schema.json", + "version": 1, + "newProjectRoot": "projects", + "projects": { + "test-ng7": { + "root": "", + "sourceRoot": "src", + "projectType": "application", + "architect": { + "build": { + "builder": "@angular-devkit/build-angular:browser", + "options": { + "outputPath": "dist", + "index": "src/index.html", + "main": "src/main.ts", + "tsConfig": "src/tsconfig.app.json", + "polyfills": "src/polyfills.ts", + "assets": ["src/assets", "src/favicon.ico"], + "styles": ["node_modules/font-awesome/css/font-awesome.css", "src/styles/app.scss"], + "scripts": ["node_modules/chart.js/dist/Chart.js"] + }, + "configurations": { + "production": { + "fileReplacements": [ + { + "replace": "src/environments/environment.ts", + "with": "src/environments/environment.prod.ts" + } + ], + "optimization": true, + "outputHashing": "all", + "sourceMap": false, + "extractCss": true, + "namedChunks": false, + "aot": true, + "extractLicenses": true, + "vendorChunk": false, + "buildOptimizer": true, + "budgets": [ + { + "type": "initial", + "maximumWarning": "2mb", + "maximumError": "5mb" + } + ] + } + } + }, + "serve": { + "builder": "@angular-devkit/build-angular:dev-server", + "options": { + "browserTarget": "test-ng7:build" + }, + "configurations": { + "production": { + "browserTarget": "test-ng7:build:production" + } + } + }, + "extract-i18n": { + "builder": "@angular-devkit/build-angular:extract-i18n", + "options": { + "browserTarget": "test-ng7:build" + } + }, + "test": { + "builder": "@angular-devkit/build-angular:karma", + "options": { + "main": "src/test.ts", + "polyfills": "src/polyfills.ts", + "tsConfig": "src/tsconfig.spec.json", + "karmaConfig": "src/karma.conf.js", + "scripts": ["node_modules/chart.js/dist/Chart.js"], + "styles": ["node_modules/font-awesome/css/font-awesome.css", "src/styles/app.scss"], + "assets": ["src/assets", "src/favicon.ico"] + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"], + "exclude": ["**/node_modules/**"] + } } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "extractCss": true, - "namedChunks": false, - "aot": true, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - } - ] } - } }, - "serve": { - "builder": "@angular-devkit/build-angular:dev-server", - "options": { - "browserTarget": "test-ng7:build" - }, - "configurations": { - "production": { - "browserTarget": "test-ng7:build:production" + "test-ng7-e2e": { + "root": "e2e/", + "projectType": "application", + "prefix": "", + "architect": { + "e2e": { + "builder": "@angular-devkit/build-angular:protractor", + "options": { + "protractorConfig": "e2e/protractor.conf.js", + "devServerTarget": "test-ng7:serve" + }, + "configurations": { + "production": { + "devServerTarget": "test-ng7:serve:production" + } + } + }, + "lint": { + "builder": "@angular-devkit/build-angular:tslint", + "options": { + "tsConfig": "e2e/tsconfig.e2e.json", + "exclude": ["**/node_modules/**"] + } + } } - } - }, - "extract-i18n": { - "builder": "@angular-devkit/build-angular:extract-i18n", - "options": { - "browserTarget": "test-ng7:build" - } - }, - "test": { - "builder": "@angular-devkit/build-angular:karma", - "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", - "scripts": [ - "node_modules/chart.js/dist/Chart.js" - ], - "styles": [ - "node_modules/font-awesome/css/font-awesome.css", - "src/styles/app.scss" - ], - "assets": [ - "src/assets", - "src/favicon.ico" - ] - } - }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": [ - "src/tsconfig.app.json", - "src/tsconfig.spec.json" - ], - "exclude": [ - "**/node_modules/**" - ] - } } - } }, - "test-ng7-e2e": { - "root": "e2e/", - "projectType": "application", - "prefix": "", - "architect": { - "e2e": { - "builder": "@angular-devkit/build-angular:protractor", - "options": { - "protractorConfig": "e2e/protractor.conf.js", - "devServerTarget": "test-ng7:serve" - }, - "configurations": { - "production": { - "devServerTarget": "test-ng7:serve:production" - } - } + "defaultProject": "test-ng7", + "schematics": { + "@schematics/angular:component": { + "prefix": "app", + "styleext": "scss" }, - "lint": { - "builder": "@angular-devkit/build-angular:tslint", - "options": { - "tsConfig": "e2e/tsconfig.e2e.json", - "exclude": [ - "**/node_modules/**" - ] - } + "@schematics/angular:directive": { + "prefix": "app" } - } - } - }, - "defaultProject": "test-ng7", - "schematics": { - "@schematics/angular:component": { - "prefix": "app", - "styleext": "scss" - }, - "@schematics/angular:directive": { - "prefix": "app" } - } } diff --git a/package.json b/package.json index ff4e0fb9e..ddff8ed87 100644 --- a/package.json +++ b/package.json @@ -1,60 +1,61 @@ { - "name": "sb-admin-bs4-angular-8", - "version": "8.0.0", - "license": "Apache", - "scripts": { - "ng": "ng", - "start": "ng serve", - "build": "ng build --prod", - "gitbuild": "ng build --prod --base-href /start-angular/SB-Admin-BS4-Angular-7/master/dist/", - "test": "ng test", - "test-ci": "TEST_CI=true ng test", - "lint": "ng lint", - "e2e": "ng e2e" - }, - "private": true, - "dependencies": { - "@angular/animations": "9.0.2", - "@angular/common": "9.0.2", - "@angular/compiler": "9.0.2", - "@angular/core": "9.0.2", - "@angular/forms": "9.0.2", - "@angular/localize": "^9.0.2", - "@angular/platform-browser": "9.0.2", - "@angular/platform-browser-dynamic": "9.0.2", - "@angular/router": "9.0.2", - "@ng-bootstrap/ng-bootstrap": "6.0.0", - "@ngx-translate/core": "12.1.1", - "@ngx-translate/http-loader": "4.0.0", - "chart.js": "2.9.3", - "core-js": "3.6.4", - "font-awesome": "4.7.0", - "ng2-charts": "2.3.0", - "rxjs": "6.5.4", - "tslib": "^1.11.0", - "yarn": "1.22.0", - "zone.js": "~0.10.2" - }, - "devDependencies": { - "@angular-devkit/build-angular": "~0.900.3", - "@angular/cli": "9.0.3", - "@angular/compiler-cli": "9.0.2", - "@angular/language-service": "9.0.2", - "@types/jasmine": "3.5.7", - "@types/jasminewd2": "2.0.8", - "@types/node": "13.7.6", - "codelyzer": "^5.2.1", - "jasmine-core": "3.5.0", - "jasmine-spec-reporter": "4.2.1", - "karma": "^4.4.1", - "karma-chrome-launcher": "3.1.0", - "karma-cli": "2.0.0", - "karma-coverage-istanbul-reporter": "2.1.1", - "karma-jasmine": "3.1.1", - "karma-jasmine-html-reporter": "1.5.2", - "protractor": "5.4.3", - "ts-node": "8.6.2", - "tslint": "6.0.0", - "typescript": "^3.6.5" - } + "name": "sb-admin-bs4-angular-9", + "version": "9.0.0", + "license": "Apache", + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build --prod", + "gitbuild": "ng build --prod --base-href /start-angular/SB-Admin-BS4-Angular-7/master/dist/", + "test": "ng test", + "test-ci": "TEST_CI=true ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "private": true, + "dependencies": { + "@angular/animations": "9.1.1", + "@angular/common": "9.1.1", + "@angular/compiler": "9.1.1", + "@angular/core": "9.1.1", + "@angular/forms": "9.1.1", + "@angular/localize": "9.1.1", + "@angular/platform-browser": "9.1.1", + "@angular/platform-browser-dynamic": "9.1.1", + "@angular/router": "9.1.1", + "@ng-bootstrap/ng-bootstrap": "6.0.2", + "@ngx-translate/core": "12.1.2", + "@ngx-translate/http-loader": "4.0.0", + "chart.js": "2.9.3", + "core-js": "3.6.4", + "font-awesome": "4.7.0", + "ng2-charts": "2.3.0", + "rxjs": "6.5.5", + "tslib": "^1.11.1", + "zone.js": "~0.10.3" + }, + "devDependencies": { + "@angular-devkit/build-angular": "~0.901.1", + "@angular/cli": "9.1.1", + "@angular/compiler-cli": "9.1.1", + "@angular/language-service": "9.1.1", + "@types/jasmine": "3.5.10", + "@types/jasminewd2": "2.0.8", + "@types/node": "13.7.6", + "codelyzer": "^5.2.1", + "jasmine-core": "3.5.0", + "jasmine-spec-reporter": "4.2.1", + "karma": "^4.4.1", + "karma-chrome-launcher": "3.1.0", + "karma-cli": "2.0.0", + "karma-coverage-istanbul-reporter": "2.1.1", + "karma-jasmine": "3.1.1", + "karma-jasmine-html-reporter": "1.5.2", + "prettier": "2.0.4", + "protractor": "5.4.3", + "ts-node": "8.6.2", + "tslint": "6.0.0", + "typescript": "^3.6.5", + "yarn": "1.22.4" + } } diff --git a/src/app/access-denied/access-denied-routing.module.ts b/src/app/access-denied/access-denied-routing.module.ts index ee072108d..bc368aaef 100644 --- a/src/app/access-denied/access-denied-routing.module.ts +++ b/src/app/access-denied/access-denied-routing.module.ts @@ -1,10 +1,11 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { AccessDeniedComponent } from './access-denied.component'; const routes: Routes = [ { - path: '', component: AccessDeniedComponent + path: '', + component: AccessDeniedComponent } ]; @@ -12,5 +13,4 @@ const routes: Routes = [ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class AccessDeniedRoutingModule { -} +export class AccessDeniedRoutingModule {} diff --git a/src/app/access-denied/access-denied.component.html b/src/app/access-denied/access-denied.component.html index ffaa73651..adfa08f03 100644 --- a/src/app/access-denied/access-denied.component.html +++ b/src/app/access-denied/access-denied.component.html @@ -1,3 +1,3 @@

- access-denied works! + access-denied works!

diff --git a/src/app/access-denied/access-denied.component.spec.ts b/src/app/access-denied/access-denied.component.spec.ts index 330a5752f..7c59b53f4 100644 --- a/src/app/access-denied/access-denied.component.spec.ts +++ b/src/app/access-denied/access-denied.component.spec.ts @@ -3,23 +3,22 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AccessDeniedComponent } from './access-denied.component'; describe('AccessDeniedComponent', () => { - let component: AccessDeniedComponent; - let fixture: ComponentFixture; + let component: AccessDeniedComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AccessDeniedComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AccessDeniedComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AccessDeniedComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AccessDeniedComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/access-denied/access-denied.component.ts b/src/app/access-denied/access-denied.component.ts index bfd6c65b2..c78e353ef 100644 --- a/src/app/access-denied/access-denied.component.ts +++ b/src/app/access-denied/access-denied.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-access-denied', - templateUrl: './access-denied.component.html', - styleUrls: ['./access-denied.component.scss'] + selector: 'app-access-denied', + templateUrl: './access-denied.component.html', + styleUrls: ['./access-denied.component.scss'] }) export class AccessDeniedComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/access-denied/access-denied.module.spec.ts b/src/app/access-denied/access-denied.module.spec.ts index 1136df64f..adec4b932 100644 --- a/src/app/access-denied/access-denied.module.spec.ts +++ b/src/app/access-denied/access-denied.module.spec.ts @@ -1,13 +1,13 @@ import { AccessDeniedModule } from './access-denied.module'; describe('AccessDeniedModule', () => { - let accessDeniedModule: AccessDeniedModule; + let accessDeniedModule: AccessDeniedModule; - beforeEach(() => { - accessDeniedModule = new AccessDeniedModule(); - }); + beforeEach(() => { + accessDeniedModule = new AccessDeniedModule(); + }); - it('should create an instance', () => { - expect(accessDeniedModule).toBeTruthy(); - }); + it('should create an instance', () => { + expect(accessDeniedModule).toBeTruthy(); + }); }); diff --git a/src/app/access-denied/access-denied.module.ts b/src/app/access-denied/access-denied.module.ts index 17e16cc2d..aee4050fb 100644 --- a/src/app/access-denied/access-denied.module.ts +++ b/src/app/access-denied/access-denied.module.ts @@ -1,14 +1,11 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { AccessDeniedRoutingModule } from './access-denied-routing.module'; import { AccessDeniedComponent } from './access-denied.component'; @NgModule({ - imports: [ - CommonModule, - AccessDeniedRoutingModule - ], - declarations: [AccessDeniedComponent] + imports: [CommonModule, AccessDeniedRoutingModule], + declarations: [AccessDeniedComponent] }) -export class AccessDeniedModule { } +export class AccessDeniedModule {} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8ada05881..3421fb208 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,15 +1,24 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { AppComponent } from './app.component'; +import { RouterModule, Routes } from '@angular/router'; import { AuthGuard } from './shared'; const routes: Routes = [ - { path: '', loadChildren: () => import('./layout/layout.module').then(m => m.LayoutModule), canActivate: [AuthGuard] }, - { path: 'login', loadChildren: () => import('./login/login.module').then(m => m.LoginModule) }, - { path: 'signup', loadChildren: () => import('./signup/signup.module').then(m => m.SignupModule) }, - { path: 'error', loadChildren: () => import('./server-error/server-error.module').then(m => m.ServerErrorModule) }, - { path: 'access-denied', loadChildren: () => import('./access-denied/access-denied.module').then(m => m.AccessDeniedModule) }, - { path: 'not-found', loadChildren: () => import('./not-found/not-found.module').then(m => m.NotFoundModule) }, + { + path: '', + loadChildren: () => import('./layout/layout.module').then((m) => m.LayoutModule), + canActivate: [AuthGuard] + }, + { path: 'login', loadChildren: () => import('./login/login.module').then((m) => m.LoginModule) }, + { path: 'signup', loadChildren: () => import('./signup/signup.module').then((m) => m.SignupModule) }, + { + path: 'error', + loadChildren: () => import('./server-error/server-error.module').then((m) => m.ServerErrorModule) + }, + { + path: 'access-denied', + loadChildren: () => import('./access-denied/access-denied.module').then((m) => m.AccessDeniedModule) + }, + { path: 'not-found', loadChildren: () => import('./not-found/not-found.module').then((m) => m.NotFoundModule) }, { path: '**', redirectTo: 'not-found' } ]; diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index dd7f76c33..eff41ab32 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,31 +1,27 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { APP_BASE_HREF } from '@angular/common'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { AppComponent } from './app.component'; import { AppModule } from './app.module'; describe('AppComponent', () => { - let component: AppComponent; - let fixture: ComponentFixture; + let component: AppComponent; + let fixture: ComponentFixture; - beforeEach( - async(() => { - TestBed.configureTestingModule({ - imports: [AppModule], - providers: [ - { provide: APP_BASE_HREF, useValue: '/' }, - ] - }).compileComponents(); - }) - ); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [AppModule], + providers: [{ provide: APP_BASE_HREF, useValue: '/' }] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AppComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AppComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 20d03bacd..0ca1ed29d 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -6,9 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./app.component.scss'] }) export class AppComponent implements OnInit { - constructor() { - } + constructor() {} - ngOnInit() { - } + ngOnInit() {} } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 12ed253ce..a3c5151d4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,11 +3,11 @@ import { HttpClientModule } from '@angular/common/http'; import { NgModule } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { LanguageTranslationModule } from './shared/modules/language-translation/language-translation.module' import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { AuthGuard } from './shared'; +import { LanguageTranslationModule } from './shared/modules/language-translation/language-translation.module'; @NgModule({ imports: [ diff --git a/src/app/layout/blank-page/blank-page-routing.module.ts b/src/app/layout/blank-page/blank-page-routing.module.ts index 0644ef0f0..cdb35f1d4 100644 --- a/src/app/layout/blank-page/blank-page-routing.module.ts +++ b/src/app/layout/blank-page/blank-page-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { BlankPageComponent } from './blank-page.component'; const routes: Routes = [ diff --git a/src/app/layout/blank-page/blank-page.component.spec.ts b/src/app/layout/blank-page/blank-page.component.spec.ts index 75b89af12..cf6041429 100644 --- a/src/app/layout/blank-page/blank-page.component.spec.ts +++ b/src/app/layout/blank-page/blank-page.component.spec.ts @@ -6,13 +6,11 @@ describe('BlankPageComponent', () => { let component: BlankPageComponent; let fixture: ComponentFixture; - beforeEach( - async(() => { - TestBed.configureTestingModule({ - declarations: [BlankPageComponent] - }).compileComponents(); - }) - ); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [BlankPageComponent] + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(BlankPageComponent); diff --git a/src/app/layout/blank-page/blank-page.module.ts b/src/app/layout/blank-page/blank-page.module.ts index 55d023f06..892df074d 100644 --- a/src/app/layout/blank-page/blank-page.module.ts +++ b/src/app/layout/blank-page/blank-page.module.ts @@ -1,5 +1,5 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { BlankPageRoutingModule } from './blank-page-routing.module'; import { BlankPageComponent } from './blank-page.component'; diff --git a/src/app/layout/bs-component/bs-component-routing.module.ts b/src/app/layout/bs-component/bs-component-routing.module.ts index a6282a365..88f0fda6a 100644 --- a/src/app/layout/bs-component/bs-component-routing.module.ts +++ b/src/app/layout/bs-component/bs-component-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { BsComponentComponent } from './bs-component.component'; const routes: Routes = [ diff --git a/src/app/layout/bs-component/bs-component.component.spec.ts b/src/app/layout/bs-component/bs-component.component.spec.ts index f639e010d..99a8614a0 100644 --- a/src/app/layout/bs-component/bs-component.component.spec.ts +++ b/src/app/layout/bs-component/bs-component.component.spec.ts @@ -5,24 +5,22 @@ import { BsComponentComponent } from './bs-component.component'; import { BsComponentModule } from './bs-component.module'; describe('BsComponentComponent', () => { - let component: BsComponentComponent; - let fixture: ComponentFixture; + let component: BsComponentComponent; + let fixture: ComponentFixture; - beforeEach( - async(() => { - TestBed.configureTestingModule({ - imports: [BsComponentModule, RouterTestingModule], - }).compileComponents(); - }) - ); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [BsComponentModule, RouterTestingModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(BsComponentComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(BsComponentComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/bs-component.module.ts b/src/app/layout/bs-component/bs-component.module.ts index 1ddf03887..8868b904d 100644 --- a/src/app/layout/bs-component/bs-component.module.ts +++ b/src/app/layout/bs-component/bs-component.module.ts @@ -1,36 +1,29 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { PageHeaderModule } from '../../shared'; import { BsComponentRoutingModule } from './bs-component-routing.module'; import { BsComponentComponent } from './bs-component.component'; import { AlertComponent, ButtonsComponent, - ModalComponent, CollapseComponent, DatePickerComponent, DropdownComponent, + ModalComponent, PaginationComponent, PopOverComponent, ProgressbarComponent, - TabsComponent, RatingComponent, - TooltipComponent, - TimepickerComponent + TabsComponent, + TimepickerComponent, + TooltipComponent } from './components'; -import { PageHeaderModule } from '../../shared'; @NgModule({ - imports: [ - CommonModule, - BsComponentRoutingModule, - FormsModule, - ReactiveFormsModule, - NgbModule, - PageHeaderModule - ], + imports: [CommonModule, BsComponentRoutingModule, FormsModule, ReactiveFormsModule, NgbModule, PageHeaderModule], declarations: [ BsComponentComponent, ButtonsComponent, diff --git a/src/app/layout/bs-component/components/alert/alert.component.html b/src/app/layout/bs-component/components/alert/alert.component.html index a658d12d1..c488e53de 100644 --- a/src/app/layout/bs-component/components/alert/alert.component.html +++ b/src/app/layout/bs-component/components/alert/alert.component.html @@ -4,7 +4,7 @@
Buttons

- {{ alert.message }} + {{ alert.message }}

diff --git a/src/app/layout/bs-component/components/alert/alert.component.spec.ts b/src/app/layout/bs-component/components/alert/alert.component.spec.ts index a2a41ce12..d2e83cdc9 100644 --- a/src/app/layout/bs-component/components/alert/alert.component.spec.ts +++ b/src/app/layout/bs-component/components/alert/alert.component.spec.ts @@ -4,24 +4,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { AlertComponent } from './alert.component'; describe('AlertComponent', () => { - let component: AlertComponent; - let fixture: ComponentFixture; + let component: AlertComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AlertComponent ], - imports: [ NgbModule ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [AlertComponent], + imports: [NgbModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(AlertComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(AlertComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/alert/alert.component.ts b/src/app/layout/bs-component/components/alert/alert.component.ts index 335779f50..29ec29891 100644 --- a/src/app/layout/bs-component/components/alert/alert.component.ts +++ b/src/app/layout/bs-component/components/alert/alert.component.ts @@ -7,27 +7,33 @@ import { Component, OnInit } from '@angular/core'; }) export class AlertComponent implements OnInit { alerts: Array = []; + constructor() { - this.alerts.push({ - id: 1, - type: 'success', - message: 'This is an success alert', - }, { - id: 2, - type: 'info', - message: 'This is an info alert', - }, { - id: 3, - type: 'warning', - message: 'This is a warning alert', - }, { - id: 4, - type: 'danger', - message: 'This is a danger alert', - }); + this.alerts.push( + { + id: 1, + type: 'success', + message: 'This is an success alert' + }, + { + id: 2, + type: 'info', + message: 'This is an info alert' + }, + { + id: 3, + type: 'warning', + message: 'This is a warning alert' + }, + { + id: 4, + type: 'danger', + message: 'This is a danger alert' + } + ); } - ngOnInit() { } + ngOnInit() {} public closeAlert(alert: any) { const index: number = this.alerts.indexOf(alert); diff --git a/src/app/layout/bs-component/components/buttons/buttons.component.html b/src/app/layout/bs-component/components/buttons/buttons.component.html index a857e9fd4..83b0230a3 100644 --- a/src/app/layout/bs-component/components/buttons/buttons.component.html +++ b/src/app/layout/bs-component/components/buttons/buttons.component.html @@ -1,48 +1,42 @@
-
- Radio Button group (Using ngModel) -
+
Radio Button group (Using ngModel)
-
-
-
- Radio Button group (Ractive Forms) -
+
Radio Button group (Ractive Forms)
-
-
-
- Model: {{ model | json }} -
+
Model: {{ model | json }}
- diff --git a/src/app/layout/bs-component/components/date-picker/date-picker.component.spec.ts b/src/app/layout/bs-component/components/date-picker/date-picker.component.spec.ts index b5d4b2f68..c19579d97 100644 --- a/src/app/layout/bs-component/components/date-picker/date-picker.component.spec.ts +++ b/src/app/layout/bs-component/components/date-picker/date-picker.component.spec.ts @@ -5,27 +5,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { DatePickerComponent } from './date-picker.component'; describe('DatePickerComponent', () => { - let component: DatePickerComponent; - let fixture: ComponentFixture; + let component: DatePickerComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - NgbModule - ], - declarations: [ DatePickerComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [FormsModule, NgbModule], + declarations: [DatePickerComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(DatePickerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(DatePickerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/date-picker/date-picker.component.ts b/src/app/layout/bs-component/components/date-picker/date-picker.component.ts index e86122429..b66d6cfe1 100644 --- a/src/app/layout/bs-component/components/date-picker/date-picker.component.ts +++ b/src/app/layout/bs-component/components/date-picker/date-picker.component.ts @@ -7,9 +7,8 @@ import { Component, OnInit } from '@angular/core'; }) export class DatePickerComponent implements OnInit { model: any; - constructor() { } - ngOnInit() { - } + constructor() {} + ngOnInit() {} } diff --git a/src/app/layout/bs-component/components/dropdown/dropdown.component.html b/src/app/layout/bs-component/components/dropdown/dropdown.component.html index e0b30dd97..32feaeff9 100644 --- a/src/app/layout/bs-component/components/dropdown/dropdown.component.html +++ b/src/app/layout/bs-component/components/dropdown/dropdown.component.html @@ -3,7 +3,7 @@
- @@ -20,16 +26,32 @@
Advanced Pagination
maxSize = 5, rotate = false
- +
maxSize = 5, rotate = true
- +
maxSize = 5, rotate = true, ellipses = false
- -
- Current page: {{advancedPagination}} -
+ +
Current page: {{ advancedPagination }}
@@ -39,9 +61,9 @@
Pagination size
- - - + + +
@@ -50,9 +72,13 @@
Disabled pagination

Pagination control can be disabled:

- -
-
diff --git a/src/app/layout/bs-component/components/pagination/pagination.component.spec.ts b/src/app/layout/bs-component/components/pagination/pagination.component.spec.ts index abea4da0d..5d6998fc2 100644 --- a/src/app/layout/bs-component/components/pagination/pagination.component.spec.ts +++ b/src/app/layout/bs-component/components/pagination/pagination.component.spec.ts @@ -4,26 +4,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { PaginationComponent } from './pagination.component'; describe('PaginationComponent', () => { - let component: PaginationComponent; - let fixture: ComponentFixture; + let component: PaginationComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - NgbModule - ], - declarations: [ PaginationComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NgbModule], + declarations: [PaginationComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(PaginationComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(PaginationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/pagination/pagination.component.ts b/src/app/layout/bs-component/components/pagination/pagination.component.ts index 1ca5ded85..c941b538b 100644 --- a/src/app/layout/bs-component/components/pagination/pagination.component.ts +++ b/src/app/layout/bs-component/components/pagination/pagination.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; @Component({ selector: 'app-pagination', diff --git a/src/app/layout/bs-component/components/pop-over/pop-over.component.html b/src/app/layout/bs-component/components/pop-over/pop-over.component.html index aaae66451..a0efc5203 100644 --- a/src/app/layout/bs-component/components/pop-over/pop-over.component.html +++ b/src/app/layout/bs-component/components/pop-over/pop-over.component.html @@ -3,24 +3,44 @@ Pop over
- - - -
diff --git a/src/app/layout/bs-component/components/pop-over/pop-over.component.spec.ts b/src/app/layout/bs-component/components/pop-over/pop-over.component.spec.ts index 5bff9f48f..1bfa1bf39 100644 --- a/src/app/layout/bs-component/components/pop-over/pop-over.component.spec.ts +++ b/src/app/layout/bs-component/components/pop-over/pop-over.component.spec.ts @@ -3,23 +3,22 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PopOverComponent } from './pop-over.component'; describe('PopOverComponent', () => { - let component: PopOverComponent; - let fixture: ComponentFixture; + let component: PopOverComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ PopOverComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [PopOverComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(PopOverComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(PopOverComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/pop-over/pop-over.component.ts b/src/app/layout/bs-component/components/pop-over/pop-over.component.ts index 13f4b688e..7afd577fc 100644 --- a/src/app/layout/bs-component/components/pop-over/pop-over.component.ts +++ b/src/app/layout/bs-component/components/pop-over/pop-over.component.ts @@ -6,10 +6,7 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./pop-over.component.scss'] }) export class PopOverComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/layout/bs-component/components/progressbar/progressbar.component.html b/src/app/layout/bs-component/components/progressbar/progressbar.component.html index 22b5f5542..20b12dcfb 100644 --- a/src/app/layout/bs-component/components/progressbar/progressbar.component.html +++ b/src/app/layout/bs-component/components/progressbar/progressbar.component.html @@ -1,12 +1,26 @@
Progressbar
-

-

-

-

25

-

Copying file 2 of 4...

-

50%

-

Completed!

+

+ +

+

+ +

+

+ +

+

+ 25 +

+

+ Copying file 2 of 4... +

+

+ 50% +

+

+ Completed! +

diff --git a/src/app/layout/bs-component/components/progressbar/progressbar.component.spec.ts b/src/app/layout/bs-component/components/progressbar/progressbar.component.spec.ts index 18cd4c986..28ca5c46f 100644 --- a/src/app/layout/bs-component/components/progressbar/progressbar.component.spec.ts +++ b/src/app/layout/bs-component/components/progressbar/progressbar.component.spec.ts @@ -4,26 +4,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { ProgressbarComponent } from './progressbar.component'; describe('ProgressbarComponent', () => { - let component: ProgressbarComponent; - let fixture: ComponentFixture; + let component: ProgressbarComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - NgbModule - ], - declarations: [ ProgressbarComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NgbModule], + declarations: [ProgressbarComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ProgressbarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ProgressbarComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/progressbar/progressbar.component.ts b/src/app/layout/bs-component/components/progressbar/progressbar.component.ts index ea3eaeb45..486af516d 100644 --- a/src/app/layout/bs-component/components/progressbar/progressbar.component.ts +++ b/src/app/layout/bs-component/components/progressbar/progressbar.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-progressbar', - templateUrl: './progressbar.component.html', - styleUrls: ['./progressbar.component.scss'] + selector: 'app-progressbar', + templateUrl: './progressbar.component.html', + styleUrls: ['./progressbar.component.scss'] }) export class ProgressbarComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/layout/bs-component/components/rating/rating.component.html b/src/app/layout/bs-component/components/rating/rating.component.html index dc2f1bb00..f034e1e46 100644 --- a/src/app/layout/bs-component/components/rating/rating.component.html +++ b/src/app/layout/bs-component/components/rating/rating.component.html @@ -1,10 +1,8 @@
-
- Rating (Basic demo) -
+
Rating (Basic demo)
- -
-
Rate: {{currentRate}}
+ +
+
Rate: {{currentRate}}
diff --git a/src/app/layout/bs-component/components/rating/rating.component.spec.ts b/src/app/layout/bs-component/components/rating/rating.component.spec.ts index f8d8d0350..8542196e5 100644 --- a/src/app/layout/bs-component/components/rating/rating.component.spec.ts +++ b/src/app/layout/bs-component/components/rating/rating.component.spec.ts @@ -1,28 +1,26 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { BsComponentModule } from '../../bs-component.module'; import { RatingComponent } from './rating.component'; -import { BsComponentModule } from '../../bs-component.module'; describe('RatingComponent', () => { - let component: RatingComponent; - let fixture: ComponentFixture; + let component: RatingComponent; + let fixture: ComponentFixture; - beforeEach( - async(() => { - TestBed.configureTestingModule({ - imports: [BsComponentModule, RouterTestingModule], - }).compileComponents(); - }) - ); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [BsComponentModule, RouterTestingModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(RatingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(RatingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/rating/rating.component.ts b/src/app/layout/bs-component/components/rating/rating.component.ts index 27087929d..61f5c2c95 100644 --- a/src/app/layout/bs-component/components/rating/rating.component.ts +++ b/src/app/layout/bs-component/components/rating/rating.component.ts @@ -1,15 +1,14 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-rating', - templateUrl: './rating.component.html', - styleUrls: ['./rating.component.scss'] + selector: 'app-rating', + templateUrl: './rating.component.html', + styleUrls: ['./rating.component.scss'] }) export class RatingComponent implements OnInit { - currentRate = 8; - constructor() { } + currentRate = 8; - ngOnInit() { - } + constructor() {} + ngOnInit() {} } diff --git a/src/app/layout/bs-component/components/tabs/tabs.component.html b/src/app/layout/bs-component/components/tabs/tabs.component.html index 00c406aad..b459b0965 100644 --- a/src/app/layout/bs-component/components/tabs/tabs.component.html +++ b/src/app/layout/bs-component/components/tabs/tabs.component.html @@ -6,29 +6,39 @@ -

Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth - master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh - dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum - iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

+

+ Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown + aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan + helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu + banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. + Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui. +

Fancy title -

Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table - craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl - cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia - yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean - shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero - sint qui sapiente accusamus tattooed echo park.

+

+ Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson + artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo + enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud + organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia + yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes + anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson + biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente + accusamus tattooed echo park. +

- + -

Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth - master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh - dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum - iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

+

+ Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown + aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan + helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu + banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. + Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui. +

@@ -42,29 +52,40 @@ -

Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth - master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh - dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum - iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

+

+ Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown + aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan + helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu + banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. + Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui. +

Fancy title - Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. -

Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table - craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl - cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia - yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean - shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero - sint qui sapiente accusamus tattooed echo park.

+ Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. +

+ Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson + artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo + enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud + organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia + yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes + anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson + biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente + accusamus tattooed echo park. +

- + -

Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth - master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh - dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum - iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.

+

+ Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown + aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan + helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu + banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. + Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui. +

diff --git a/src/app/layout/bs-component/components/tabs/tabs.component.spec.ts b/src/app/layout/bs-component/components/tabs/tabs.component.spec.ts index aa3179923..e14c6f295 100644 --- a/src/app/layout/bs-component/components/tabs/tabs.component.spec.ts +++ b/src/app/layout/bs-component/components/tabs/tabs.component.spec.ts @@ -4,26 +4,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TabsComponent } from './tabs.component'; describe('TabsComponent', () => { - let component: TabsComponent; - let fixture: ComponentFixture; + let component: TabsComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - NgbModule - ], - declarations: [ TabsComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [NgbModule], + declarations: [TabsComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(TabsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(TabsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/tabs/tabs.component.ts b/src/app/layout/bs-component/components/tabs/tabs.component.ts index 839e50179..8937d9c6d 100644 --- a/src/app/layout/bs-component/components/tabs/tabs.component.ts +++ b/src/app/layout/bs-component/components/tabs/tabs.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-tabs', - templateUrl: './tabs.component.html', - styleUrls: ['./tabs.component.scss'] + selector: 'app-tabs', + templateUrl: './tabs.component.html', + styleUrls: ['./tabs.component.scss'] }) export class TabsComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/layout/bs-component/components/timepicker/timepicker.component.html b/src/app/layout/bs-component/components/timepicker/timepicker.component.html index 63c6d0604..c092f95ca 100644 --- a/src/app/layout/bs-component/components/timepicker/timepicker.component.html +++ b/src/app/layout/bs-component/components/timepicker/timepicker.component.html @@ -4,9 +4,7 @@
Timepicker (Default)
-
- Selected time: {{defaultTime | json}} -
+
Selected time: {{ defaultTime | json }}
@@ -15,12 +13,10 @@
Timepicker (Default)
- -
- Selected time: {{meridianTime | json}} -
+
Selected time: {{ meridianTime | json }}
@@ -29,12 +25,10 @@
Timepicker (Seconds)
- -
- Selected time: {{SecondsTime | json}} -
+
Selected time: {{ SecondsTime | json }}
@@ -42,26 +36,29 @@
Timepicker (Custom Step)
- +
- +
- +
- +
-
- Selected time: {{customTime | json}} -
+
Selected time: {{ customTime | json }}
diff --git a/src/app/layout/bs-component/components/timepicker/timepicker.component.spec.ts b/src/app/layout/bs-component/components/timepicker/timepicker.component.spec.ts index 3a4279044..e3039601c 100644 --- a/src/app/layout/bs-component/components/timepicker/timepicker.component.spec.ts +++ b/src/app/layout/bs-component/components/timepicker/timepicker.component.spec.ts @@ -5,27 +5,23 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; import { TimepickerComponent } from './timepicker.component'; describe('TimepickerComponent', () => { - let component: TimepickerComponent; - let fixture: ComponentFixture; + let component: TimepickerComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - NgbModule - ], - declarations: [ TimepickerComponent ] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [FormsModule, NgbModule], + declarations: [TimepickerComponent] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(TimepickerComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(TimepickerComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/timepicker/timepicker.component.ts b/src/app/layout/bs-component/components/timepicker/timepicker.component.ts index b439769cc..5d671376c 100644 --- a/src/app/layout/bs-component/components/timepicker/timepicker.component.ts +++ b/src/app/layout/bs-component/components/timepicker/timepicker.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import {NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; +import { NgbTimeStruct } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'app-timepicker', @@ -7,14 +7,14 @@ import {NgbTimeStruct} from '@ng-bootstrap/ng-bootstrap'; styleUrls: ['./timepicker.component.scss'] }) export class TimepickerComponent { - defaultTime = {hour: 13, minute: 30}; - meridianTime = {hour: 13, minute: 30}; + defaultTime = { hour: 13, minute: 30 }; + meridianTime = { hour: 13, minute: 30 }; meridian = true; - SecondsTime: NgbTimeStruct = {hour: 13, minute: 30, second: 30}; + SecondsTime: NgbTimeStruct = { hour: 13, minute: 30, second: 30 }; seconds = true; - customTime: NgbTimeStruct = {hour: 13, minute: 30, second: 0}; + customTime: NgbTimeStruct = { hour: 13, minute: 30, second: 0 }; hourStep = 1; minuteStep = 15; secondStep = 30; diff --git a/src/app/layout/bs-component/components/tooltip/tooltip.component.html b/src/app/layout/bs-component/components/tooltip/tooltip.component.html index 651f450eb..35346ef36 100644 --- a/src/app/layout/bs-component/components/tooltip/tooltip.component.html +++ b/src/app/layout/bs-component/components/tooltip/tooltip.component.html @@ -3,21 +3,21 @@ Tooltip
- - - - Tooltip with HTML -
diff --git a/src/app/layout/bs-component/components/tooltip/tooltip.component.spec.ts b/src/app/layout/bs-component/components/tooltip/tooltip.component.spec.ts index 0b3bd68bb..43373c273 100644 --- a/src/app/layout/bs-component/components/tooltip/tooltip.component.spec.ts +++ b/src/app/layout/bs-component/components/tooltip/tooltip.component.spec.ts @@ -1,27 +1,26 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; +import { BsComponentModule } from '../../bs-component.module'; import { TooltipComponent } from './tooltip.component'; -import { BsComponentModule } from '../../bs-component.module'; describe('TooltipComponent', () => { - let component: TooltipComponent; - let fixture: ComponentFixture; + let component: TooltipComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [BsComponentModule, RouterTestingModule] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [BsComponentModule, RouterTestingModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(TooltipComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(TooltipComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-component/components/tooltip/tooltip.component.ts b/src/app/layout/bs-component/components/tooltip/tooltip.component.ts index a6f17631a..e057f0d74 100644 --- a/src/app/layout/bs-component/components/tooltip/tooltip.component.ts +++ b/src/app/layout/bs-component/components/tooltip/tooltip.component.ts @@ -1,15 +1,12 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-tooltip', - templateUrl: './tooltip.component.html', - styleUrls: ['./tooltip.component.scss'] + selector: 'app-tooltip', + templateUrl: './tooltip.component.html', + styleUrls: ['./tooltip.component.scss'] }) export class TooltipComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/layout/bs-element/bs-element-routing.module.ts b/src/app/layout/bs-element/bs-element-routing.module.ts index e74d76284..df6cd2b79 100644 --- a/src/app/layout/bs-element/bs-element-routing.module.ts +++ b/src/app/layout/bs-element/bs-element-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { BsElementComponent } from './bs-element.component'; const routes: Routes = [ diff --git a/src/app/layout/bs-element/bs-element.component.html b/src/app/layout/bs-element/bs-element.component.html index 21ffcc9fe..9c5d8dfe3 100644 --- a/src/app/layout/bs-element/bs-element.component.html +++ b/src/app/layout/bs-element/bs-element.component.html @@ -4,71 +4,73 @@

Hello, world!

- This is a template for a simple marketing or informational website. It includes a large callout called a jumbotron and three supporting pieces of content. Use it as a starting point to create something more unique. + This is a template for a simple marketing or informational website. It includes a large callout called a + jumbotron and three supporting pieces of content. Use it as a starting point to create something more + unique.

- Learn more » + Learn more »

- - - - - - - - + + + + + + + +

- - - - - - - - + + + + + + + +

- - - - - - - - + + + + + + + +

-
+
- + @@ -123,7 +125,7 @@

Navbars

Well done! You successfully read this important alert message. @@ -131,43 +133,88 @@

Alerts

Heads up! This alert needs your attention, but it's not super important.
-
- Warning! Best check yo self, you're not looking too good. -
-
- Oh snap! Change a few things up and try submitting again. -
+
Warning! Best check yo self, you're not looking too good.
+
Oh snap! Change a few things up and try submitting again.
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
@@ -182,27 +229,33 @@

List groups

@@ -211,7 +264,7 @@

List group item heading

@@ -219,7 +272,9 @@

Cards

Header

Primary card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -228,7 +283,9 @@

Primary card title

Header

Secondary card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -238,7 +295,9 @@

Secondary card title

Header

Success card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -247,7 +306,9 @@

Success card title

Header

Danger card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -257,7 +318,9 @@

Danger card title

Header

Warning card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -266,7 +329,9 @@

Warning card title

Header

Info card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -276,7 +341,9 @@

Info card title

Header

Light card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -286,7 +353,9 @@

Light card title

Header

Dark card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

@@ -296,7 +365,9 @@

Dark card title

Header

Dark card title

-

Some quick example text to build on the card title and make up the bulk of the card's content.

+

+ Some quick example text to build on the card title and make up the bulk of the card's content. +

diff --git a/src/app/layout/bs-element/bs-element.component.spec.ts b/src/app/layout/bs-element/bs-element.component.spec.ts index 255cccb67..197c91346 100644 --- a/src/app/layout/bs-element/bs-element.component.spec.ts +++ b/src/app/layout/bs-element/bs-element.component.spec.ts @@ -1,28 +1,27 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; import { BsElementComponent } from './bs-element.component'; import { BsElementModule } from './bs-element.module'; describe('BsElementComponent', () => { - let component: BsElementComponent; - let fixture: ComponentFixture; + let component: BsElementComponent; + let fixture: ComponentFixture; - beforeEach(async(() => { - TestBed.configureTestingModule({ - imports: [BsElementModule, RouterTestingModule, BrowserAnimationsModule] - }) - .compileComponents(); - })); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [BsElementModule, RouterTestingModule, BrowserAnimationsModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(BsElementComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(BsElementComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/bs-element/bs-element.module.ts b/src/app/layout/bs-element/bs-element.module.ts index ed83c0f3c..a597861bc 100644 --- a/src/app/layout/bs-element/bs-element.module.ts +++ b/src/app/layout/bs-element/bs-element.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; +import { PageHeaderModule } from './../../shared'; import { BsElementRoutingModule } from './bs-element-routing.module'; import { BsElementComponent } from './bs-element.component'; -import { PageHeaderModule } from './../../shared'; -import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ imports: [CommonModule, BsElementRoutingModule, PageHeaderModule, NgbModule], diff --git a/src/app/layout/charts/charts-routing.module.ts b/src/app/layout/charts/charts-routing.module.ts index 43dc3fa74..dbef8cd7b 100644 --- a/src/app/layout/charts/charts-routing.module.ts +++ b/src/app/layout/charts/charts-routing.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; +import { RouterModule, Routes } from '@angular/router'; import { ChartsComponent } from './charts.component'; const routes: Routes = [ diff --git a/src/app/layout/charts/charts.component.html b/src/app/layout/charts/charts.component.html index 02a923883..216083b11 100644 --- a/src/app/layout/charts/charts.component.html +++ b/src/app/layout/charts/charts.component.html @@ -7,11 +7,20 @@ Bar Chart
- +
@@ -21,7 +30,15 @@ Doughnut Chart
- +
@@ -34,7 +51,15 @@ Radar Chart
- +
@@ -45,7 +70,15 @@ Pie Chart
- +
@@ -58,7 +91,16 @@ Polar Area Chart
- +
@@ -69,7 +111,18 @@ Line Chart
- +
diff --git a/src/app/layout/charts/charts.component.spec.ts b/src/app/layout/charts/charts.component.spec.ts index 8bb9ad676..941e7f82c 100644 --- a/src/app/layout/charts/charts.component.spec.ts +++ b/src/app/layout/charts/charts.component.spec.ts @@ -1,33 +1,27 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { RouterTestingModule } from '@angular/router/testing'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; +import { RouterTestingModule } from '@angular/router/testing'; import { ChartsComponent } from './charts.component'; import { ChartsModule } from './charts.module'; describe('ChartsComponent', () => { - let component: ChartsComponent; - let fixture: ComponentFixture; + let component: ChartsComponent; + let fixture: ComponentFixture; - beforeEach( - async(() => { - TestBed.configureTestingModule({ - imports: [ - ChartsModule, - RouterTestingModule, - BrowserAnimationsModule, - ], - }).compileComponents(); - }) - ); + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [ChartsModule, RouterTestingModule, BrowserAnimationsModule] + }).compileComponents(); + })); - beforeEach(() => { - fixture = TestBed.createComponent(ChartsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); + beforeEach(() => { + fixture = TestBed.createComponent(ChartsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); - it('should create', () => { - expect(component).toBeTruthy(); - }); + it('should create', () => { + expect(component).toBeTruthy(); + }); }); diff --git a/src/app/layout/charts/charts.component.ts b/src/app/layout/charts/charts.component.ts index efd849dc0..0916fea55 100644 --- a/src/app/layout/charts/charts.component.ts +++ b/src/app/layout/charts/charts.component.ts @@ -13,15 +13,7 @@ export class ChartsComponent implements OnInit { scaleShowVerticalLines: false, responsive: true }; - public barChartLabels: string[] = [ - '2006', - '2007', - '2008', - '2009', - '2010', - '2011', - '2012' - ]; + public barChartLabels: string[] = ['2006', '2007', '2008', '2009', '2010', '2011', '2012']; public barChartType: string; public barChartLegend: boolean; @@ -31,24 +23,12 @@ export class ChartsComponent implements OnInit { ]; // Doughnut - public doughnutChartLabels: string[] = [ - 'Download Sales', - 'In-Store Sales', - 'Mail-Order Sales' - ]; + public doughnutChartLabels: string[] = ['Download Sales', 'In-Store Sales', 'Mail-Order Sales']; public doughnutChartData: number[] = [350, 450, 100]; public doughnutChartType: string; // Radar - public radarChartLabels: string[] = [ - 'Eating', - 'Drinking', - 'Sleeping', - 'Designing', - 'Coding', - 'Cycling', - 'Running' - ]; + public radarChartLabels: string[] = ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running']; public radarChartData: any = [ { data: [65, 59, 90, 81, 56, 55, 40], label: 'Series A' }, { data: [28, 48, 40, 19, 96, 27, 100], label: 'Series B' } @@ -56,11 +36,7 @@ export class ChartsComponent implements OnInit { public radarChartType: string; // Pie - public pieChartLabels: string[] = [ - 'Download Sales', - 'In-Store Sales', - 'Mail Sales' - ]; + public pieChartLabels: string[] = ['Download Sales', 'In-Store Sales', 'Mail Sales']; public pieChartData: number[] = [300, 500, 100]; public pieChartType: string; @@ -83,15 +59,7 @@ export class ChartsComponent implements OnInit { { data: [28, 48, 40, 19, 86, 27, 90], label: 'Series B' }, { data: [18, 48, 77, 9, 100, 27, 40], label: 'Series C' } ]; - public lineChartLabels: Array = [ - 'January', - 'February', - 'March', - 'April', - 'May', - 'June', - 'July' - ]; + public lineChartLabels: Array = ['January', 'February', 'March', 'April', 'May', 'June', 'July']; public lineChartOptions: any = { responsive: true }; @@ -127,6 +95,8 @@ export class ChartsComponent implements OnInit { public lineChartLegend: boolean; public lineChartType: string; + constructor() {} + // events public chartClicked(e: any): void { // console.log(e); @@ -138,15 +108,7 @@ export class ChartsComponent implements OnInit { public randomize(): void { // Only Change 3 values - const data = [ - Math.round(Math.random() * 100), - 59, - 80, - Math.random() * 100, - 56, - Math.random() * 100, - 40 - ]; + const data = [Math.round(Math.random() * 100), 59, 80, Math.random() * 100, 56, Math.random() * 100, 40]; const clone = JSON.parse(JSON.stringify(this.barChartData)); clone[0].data = data; this.barChartData = clone; @@ -158,8 +120,6 @@ export class ChartsComponent implements OnInit { */ } - constructor() {} - ngOnInit() { this.barChartType = 'bar'; this.barChartLegend = true; diff --git a/src/app/layout/charts/charts.module.ts b/src/app/layout/charts/charts.module.ts index 97bdb0470..6086c7bf8 100644 --- a/src/app/layout/charts/charts.module.ts +++ b/src/app/layout/charts/charts.module.ts @@ -1,10 +1,10 @@ -import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; import { ChartsModule as Ng2Charts } from 'ng2-charts'; +import { PageHeaderModule } from '../../shared'; import { ChartsRoutingModule } from './charts-routing.module'; import { ChartsComponent } from './charts.component'; -import { PageHeaderModule } from '../../shared'; @NgModule({ imports: [CommonModule, Ng2Charts, ChartsRoutingModule, PageHeaderModule], diff --git a/src/app/layout/components/header/header.component.html b/src/app/layout/components/header/header.component.html index 1bffe40b7..66adda30c 100644 --- a/src/app/layout/components/header/header.component.html +++ b/src/app/layout/components/header/header.component.html @@ -1,123 +1,132 @@