From 8eb18217c22f04473514b0cec9141e20d29b31fa Mon Sep 17 00:00:00 2001 From: endy Date: Fri, 15 Dec 2017 08:43:17 +0500 Subject: [PATCH 01/21] fix(profile-frame): Fix error in update profile #82 --- .../pages/account-page/profile-frame/profile-frame.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/web/src/pages/account-page/profile-frame/profile-frame.component.ts b/libs/web/src/pages/account-page/profile-frame/profile-frame.component.ts index df56f6c9..0958b631 100644 --- a/libs/web/src/pages/account-page/profile-frame/profile-frame.component.ts +++ b/libs/web/src/pages/account-page/profile-frame/profile-frame.component.ts @@ -21,7 +21,7 @@ export class ProfileFrameComponent extends BaseFrameComponent { init() { super.init(); this.accountService.changeStatus$.pipe(takeUntil(this.destroyed$)).subscribe((status: any) => - this.accountProfileForm && status === EndpointStatusEnum.Updating ? this.accountProfileForm.okInProcessFromStatus(status) : false + this.accountProfileForm ? this.accountProfileForm.okInProcessFromStatus(status) : false ); } get readonly() { From 0701ae6747838a4978588ce1d717bd19ae2046ee Mon Sep 17 00:00:00 2001 From: endy Date: Fri, 15 Dec 2017 09:52:29 +0500 Subject: [PATCH 02/21] chore(scripts): Change clear and prepare run method --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 98887e6d..7615cd0f 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "ng": "ng", "lint": "ng lint", "format": "tsfmt -r", - "clear": "node ./node_modules/@rucken/cli/bin/rucken commands clear", - "prepare": "node ./node_modules/@rucken/cli/bin/rucken commands prepare", + "clear": "node ./node_modules/@rucken/cli/bin/rucken clear", + "prepare": "node ./node_modules/@rucken/cli/bin/rucken prepare", "test": "npm-run-all lint app:build-full_prod", "e2e": "ng e2e --app=demo --preserve-symlinks", "build": "npm-run-all app:build-full_prod", From 9baed6db9ebd4a12ae8b0dad5e9e1b54efbbe98c Mon Sep 17 00:00:00 2001 From: endy Date: Mon, 18 Dec 2017 15:18:21 +0500 Subject: [PATCH 03/21] fix(text-input): Set null if date value is invalid --- libs/web/src/controls/text-input/text-input.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/web/src/controls/text-input/text-input.component.ts b/libs/web/src/controls/text-input/text-input.component.ts index d36b9ad0..6affcfcf 100644 --- a/libs/web/src/controls/text-input/text-input.component.ts +++ b/libs/web/src/controls/text-input/text-input.component.ts @@ -156,7 +156,7 @@ export class TextInputComponent extends BaseComponent { } this.setDateValueFromString(this.value); if (!this._dateValue || this._dateValue.toString() === 'Invalid Date') { - this._dateValue = new Date(); + this._dateValue = null; } } get value() { From 4bc75765321b5ceda4c1730a036e84df6408a248 Mon Sep 17 00:00:00 2001 From: endy Date: Mon, 18 Dec 2017 19:50:38 +0500 Subject: [PATCH 04/21] fix(user-components): Add check userGroups before set/get values from its --- .../account-profile-form.component.ts | 24 +++++++++++-------- .../user-modal/user-modal.component.ts | 24 +++++++++++-------- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/libs/web/src/grids/users-grid/account-profile-form/account-profile-form.component.ts b/libs/web/src/grids/users-grid/account-profile-form/account-profile-form.component.ts index 07237708..25a852f0 100644 --- a/libs/web/src/grids/users-grid/account-profile-form/account-profile-form.component.ts +++ b/libs/web/src/grids/users-grid/account-profile-form/account-profile-form.component.ts @@ -38,15 +38,17 @@ export class AccountProfileFormComponent extends BaseModalComponent { init() { super.init(); - this.userGroups.user = this.item; - this.userGroups.mockedItems = - this.item.groups.map((group: any | Group) => { - return new UserGroup({ - id: group.pk, - group: group + if (this.userGroups) { + this.userGroups.user = this.item; + this.userGroups.mockedItems = + this.item.groups.map((group: any | Group) => { + return new UserGroup({ + id: group.pk, + group: group + }); }); - }); - this.userGroups.search(); + this.userGroups.search(); + } } afterCreate() { super.afterCreate(); @@ -63,8 +65,10 @@ export class AccountProfileFormComponent extends BaseModalComponent { return false; } ok() { - this.item.groups = - this.userGroups.mockedItems.map((userGroup: UserGroup) => userGroup.group); + if (this.userGroups) { + this.item.groups = + this.userGroups.mockedItems.map((userGroup: UserGroup) => userGroup.group); + } this.onOk.emit(this.item); return false; } diff --git a/libs/web/src/grids/users-grid/user-modal/user-modal.component.ts b/libs/web/src/grids/users-grid/user-modal/user-modal.component.ts index 28a1e0a3..99f73851 100644 --- a/libs/web/src/grids/users-grid/user-modal/user-modal.component.ts +++ b/libs/web/src/grids/users-grid/user-modal/user-modal.component.ts @@ -35,19 +35,23 @@ export class UserModalComponent extends BaseResourceModalComponent { onOk: EventEmitter = new EventEmitter(); afterOpen() { - this.userGroups.user = this.item; - this.userGroups.mockedItems = - this.item.groups.map((group: any | Group) => { - return new UserGroup({ - id: group.pk, - group: group + if (this.userGroups) { + this.userGroups.user = this.item; + this.userGroups.mockedItems = + this.item.groups.map((group: any | Group) => { + return new UserGroup({ + id: group.pk, + group: group + }); }); - }); - this.userGroups.search(); + this.userGroups.search(); + } } ok() { - this.item.groups = - this.userGroups.mockedItems.map((userGroup: UserGroup) => userGroup.group); + if (this.userGroups) { + this.item.groups = + this.userGroups.mockedItems.map((userGroup: UserGroup) => userGroup.group); + } return super.ok(); } } From f043becf1438ee63b0e9ee7701aab253915209fb Mon Sep 17 00:00:00 2001 From: endy Date: Wed, 20 Dec 2017 10:44:53 +0500 Subject: [PATCH 05/21] feat(base): Add interfaces for service and model and implements all from its #83 --- libs/core/src/index.ts | 4 ++++ libs/core/src/package-lock.json | 2 +- libs/core/src/shared/base/interfaces/base-model.interface.ts | 3 +++ .../core/src/shared/base/interfaces/base-service.interface.ts | 3 +++ libs/core/src/shared/base/models/base-resource.model.ts | 4 ++-- .../src/shared/base/services/base-local-repository.service.ts | 3 ++- libs/core/src/shared/services/account.service.ts | 3 ++- libs/core/src/shared/services/app.service.ts | 3 ++- libs/core/src/shared/services/token.service.ts | 3 ++- libs/web/src/package-lock.json | 2 +- libs/web/src/shared/services/shared.service.ts | 3 ++- 11 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 libs/core/src/shared/base/interfaces/base-model.interface.ts create mode 100644 libs/core/src/shared/base/interfaces/base-service.interface.ts diff --git a/libs/core/src/index.ts b/libs/core/src/index.ts index d7f25408..3f758dd4 100644 --- a/libs/core/src/index.ts +++ b/libs/core/src/index.ts @@ -1,5 +1,9 @@ import { RuckenCoreRuI18n } from './i18n/ru.i18n'; export { RuckenCoreRuI18n } from './i18n/ru.i18n'; +import { IBaseModel } from './shared/base/interfaces/base-model.interface'; +export { IBaseModel } from './shared/base/interfaces/base-model.interface'; +import { IBaseService } from './shared/base/interfaces/base-service.interface'; +export { IBaseService } from './shared/base/interfaces/base-service.interface'; import { BaseResourceModel } from './shared/base/models/base-resource.model'; export { BaseResourceModel } from './shared/base/models/base-resource.model'; import { BaseLocalRepositoryService } from './shared/base/services/base-local-repository.service'; diff --git a/libs/core/src/package-lock.json b/libs/core/src/package-lock.json index f4f67a1e..34ee4839 100644 --- a/libs/core/src/package-lock.json +++ b/libs/core/src/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rucken/core", - "version": "1.29.0", + "version": "1.29.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/libs/core/src/shared/base/interfaces/base-model.interface.ts b/libs/core/src/shared/base/interfaces/base-model.interface.ts new file mode 100644 index 00000000..bc13dc25 --- /dev/null +++ b/libs/core/src/shared/base/interfaces/base-model.interface.ts @@ -0,0 +1,3 @@ +export interface IBaseModel { + [key: string]: any; +} diff --git a/libs/core/src/shared/base/interfaces/base-service.interface.ts b/libs/core/src/shared/base/interfaces/base-service.interface.ts new file mode 100644 index 00000000..69ae10d2 --- /dev/null +++ b/libs/core/src/shared/base/interfaces/base-service.interface.ts @@ -0,0 +1,3 @@ +export interface IBaseService { + [key: string]: any; +} diff --git a/libs/core/src/shared/base/models/base-resource.model.ts b/libs/core/src/shared/base/models/base-resource.model.ts index 1ba84ef2..08d54bd6 100644 --- a/libs/core/src/shared/base/models/base-resource.model.ts +++ b/libs/core/src/shared/base/models/base-resource.model.ts @@ -2,13 +2,13 @@ import * as _ from 'lodash'; import * as moment from 'moment/moment'; import { translate } from './../../common/utils'; +import { IBaseModel } from './../interfaces/base-model.interface'; -export class BaseResourceModel { +export class BaseResourceModel implements IBaseModel { pkFieldName: string; pkIsNumber: boolean; dateAsStringFormat = 'DD.MM.YYYY'; dateInputFormat = 'YYYY-MM-DD'; - [key: string]: any; get pk(): string | number { const key = this.pkFieldName; diff --git a/libs/core/src/shared/base/services/base-local-repository.service.ts b/libs/core/src/shared/base/services/base-local-repository.service.ts index 102a148c..97b11f43 100644 --- a/libs/core/src/shared/base/services/base-local-repository.service.ts +++ b/libs/core/src/shared/base/services/base-local-repository.service.ts @@ -3,10 +3,11 @@ import * as _ from 'lodash'; import { Subject } from 'rxjs/Subject'; import { MetaModel } from '../../models/meta.model'; +import { IBaseService } from './../interfaces/base-service.interface'; @Injectable() -export class BaseLocalRepositoryService { +export class BaseLocalRepositoryService implements IBaseService { items$: Subject; items: any[]; diff --git a/libs/core/src/shared/services/account.service.ts b/libs/core/src/shared/services/account.service.ts index 41c58146..ae7fe50c 100644 --- a/libs/core/src/shared/services/account.service.ts +++ b/libs/core/src/shared/services/account.service.ts @@ -7,9 +7,10 @@ import { translate } from './../common/utils'; import { EndpointStatusEnum } from './../enums/endpoint-status.enum'; import { User } from './../models/user.model'; import { TokenService } from './token.service'; +import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class AccountService { +export class AccountService implements IBaseService { name: string; account$: Subject; apiUrl: string; diff --git a/libs/core/src/shared/services/app.service.ts b/libs/core/src/shared/services/app.service.ts index 97588a47..873ec87c 100644 --- a/libs/core/src/shared/services/app.service.ts +++ b/libs/core/src/shared/services/app.service.ts @@ -1,7 +1,8 @@ import { ComponentFactoryResolver, EventEmitter, Injectable, ViewContainerRef } from '@angular/core'; +import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class AppService { +export class AppService implements IBaseService { component: any; viewContainerRef: ViewContainerRef; translateService: any; diff --git a/libs/core/src/shared/services/token.service.ts b/libs/core/src/shared/services/token.service.ts index ae367449..4a36af5e 100644 --- a/libs/core/src/shared/services/token.service.ts +++ b/libs/core/src/shared/services/token.service.ts @@ -1,9 +1,10 @@ import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; +import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class TokenService { +export class TokenService implements IBaseService { headerName = 'Authorization'; headerPrefix = 'JWT'; diff --git a/libs/web/src/package-lock.json b/libs/web/src/package-lock.json index 4c9c6330..05eca37e 100644 --- a/libs/web/src/package-lock.json +++ b/libs/web/src/package-lock.json @@ -1,6 +1,6 @@ { "name": "@rucken/web", - "version": "1.29.0", + "version": "1.29.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/libs/web/src/shared/services/shared.service.ts b/libs/web/src/shared/services/shared.service.ts index 2b50a66b..252e58c9 100644 --- a/libs/web/src/shared/services/shared.service.ts +++ b/libs/web/src/shared/services/shared.service.ts @@ -1,9 +1,10 @@ import { Injectable, Injector } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { AppService } from '@rucken/core'; +import { IBaseService } from '@rucken/core'; @Injectable() -export class SharedService { +export class SharedService implements IBaseService { app: AppService; translateService: TranslateService; From aace8024000adda01326ae8e8bfb594e762e756b Mon Sep 17 00:00:00 2001 From: endy Date: Wed, 20 Dec 2017 14:16:09 +0500 Subject: [PATCH 06/21] fix(base): Remove interfaces change its to classes #83 --- libs/core/src/index.ts | 4 ---- libs/core/src/shared/base/interfaces/base-model.interface.ts | 3 --- .../src/shared/base/interfaces/base-service.interface.ts | 3 --- libs/core/src/shared/base/models/base-resource.model.ts | 5 +++-- .../shared/base/services/base-local-repository.service.ts | 4 ++-- libs/core/src/shared/services/account.service.ts | 5 +++-- libs/core/src/shared/services/app.service.ts | 5 +++-- libs/core/src/shared/services/token.service.ts | 4 ++-- libs/web/src/base/base-component/base-component.component.ts | 2 +- libs/web/src/shared/services/shared.service.ts | 4 ++-- 10 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 libs/core/src/shared/base/interfaces/base-model.interface.ts delete mode 100644 libs/core/src/shared/base/interfaces/base-service.interface.ts diff --git a/libs/core/src/index.ts b/libs/core/src/index.ts index 3f758dd4..d7f25408 100644 --- a/libs/core/src/index.ts +++ b/libs/core/src/index.ts @@ -1,9 +1,5 @@ import { RuckenCoreRuI18n } from './i18n/ru.i18n'; export { RuckenCoreRuI18n } from './i18n/ru.i18n'; -import { IBaseModel } from './shared/base/interfaces/base-model.interface'; -export { IBaseModel } from './shared/base/interfaces/base-model.interface'; -import { IBaseService } from './shared/base/interfaces/base-service.interface'; -export { IBaseService } from './shared/base/interfaces/base-service.interface'; import { BaseResourceModel } from './shared/base/models/base-resource.model'; export { BaseResourceModel } from './shared/base/models/base-resource.model'; import { BaseLocalRepositoryService } from './shared/base/services/base-local-repository.service'; diff --git a/libs/core/src/shared/base/interfaces/base-model.interface.ts b/libs/core/src/shared/base/interfaces/base-model.interface.ts deleted file mode 100644 index bc13dc25..00000000 --- a/libs/core/src/shared/base/interfaces/base-model.interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IBaseModel { - [key: string]: any; -} diff --git a/libs/core/src/shared/base/interfaces/base-service.interface.ts b/libs/core/src/shared/base/interfaces/base-service.interface.ts deleted file mode 100644 index 69ae10d2..00000000 --- a/libs/core/src/shared/base/interfaces/base-service.interface.ts +++ /dev/null @@ -1,3 +0,0 @@ -export interface IBaseService { - [key: string]: any; -} diff --git a/libs/core/src/shared/base/models/base-resource.model.ts b/libs/core/src/shared/base/models/base-resource.model.ts index 08d54bd6..f2f3c0d1 100644 --- a/libs/core/src/shared/base/models/base-resource.model.ts +++ b/libs/core/src/shared/base/models/base-resource.model.ts @@ -2,9 +2,10 @@ import * as _ from 'lodash'; import * as moment from 'moment/moment'; import { translate } from './../../common/utils'; -import { IBaseModel } from './../interfaces/base-model.interface'; -export class BaseResourceModel implements IBaseModel { +export class BaseResourceModel { + [key: string]: any; + pkFieldName: string; pkIsNumber: boolean; dateAsStringFormat = 'DD.MM.YYYY'; diff --git a/libs/core/src/shared/base/services/base-local-repository.service.ts b/libs/core/src/shared/base/services/base-local-repository.service.ts index 97b11f43..b4e2a6fd 100644 --- a/libs/core/src/shared/base/services/base-local-repository.service.ts +++ b/libs/core/src/shared/base/services/base-local-repository.service.ts @@ -3,11 +3,11 @@ import * as _ from 'lodash'; import { Subject } from 'rxjs/Subject'; import { MetaModel } from '../../models/meta.model'; -import { IBaseService } from './../interfaces/base-service.interface'; @Injectable() -export class BaseLocalRepositoryService implements IBaseService { +export class BaseLocalRepositoryService { + [key: string]: any; items$: Subject; items: any[]; diff --git a/libs/core/src/shared/services/account.service.ts b/libs/core/src/shared/services/account.service.ts index ae7fe50c..c7105c9b 100644 --- a/libs/core/src/shared/services/account.service.ts +++ b/libs/core/src/shared/services/account.service.ts @@ -7,10 +7,11 @@ import { translate } from './../common/utils'; import { EndpointStatusEnum } from './../enums/endpoint-status.enum'; import { User } from './../models/user.model'; import { TokenService } from './token.service'; -import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class AccountService implements IBaseService { +export class AccountService { + [key: string]: any; + name: string; account$: Subject; apiUrl: string; diff --git a/libs/core/src/shared/services/app.service.ts b/libs/core/src/shared/services/app.service.ts index 873ec87c..3d7eaf22 100644 --- a/libs/core/src/shared/services/app.service.ts +++ b/libs/core/src/shared/services/app.service.ts @@ -1,8 +1,9 @@ import { ComponentFactoryResolver, EventEmitter, Injectable, ViewContainerRef } from '@angular/core'; -import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class AppService implements IBaseService { +export class AppService { + [key: string]: any; + component: any; viewContainerRef: ViewContainerRef; translateService: any; diff --git a/libs/core/src/shared/services/token.service.ts b/libs/core/src/shared/services/token.service.ts index 4a36af5e..607c52a3 100644 --- a/libs/core/src/shared/services/token.service.ts +++ b/libs/core/src/shared/services/token.service.ts @@ -1,10 +1,10 @@ import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; -import { IBaseService } from '../base/interfaces/base-service.interface'; @Injectable() -export class TokenService implements IBaseService { +export class TokenService { + [key: string]: any; headerName = 'Authorization'; headerPrefix = 'JWT'; diff --git a/libs/web/src/base/base-component/base-component.component.ts b/libs/web/src/base/base-component/base-component.component.ts index 87d37e91..d3db4620 100644 --- a/libs/web/src/base/base-component/base-component.component.ts +++ b/libs/web/src/base/base-component/base-component.component.ts @@ -12,6 +12,7 @@ import { SharedService } from '../../shared/services/shared.service'; template: '' }) export class BaseComponent implements OnInit, OnDestroy { + [key: string]: any; @Input() account: any | User; @@ -34,7 +35,6 @@ export class BaseComponent implements OnInit, OnDestroy { errorsValue: any; infoValue: any; - [key: string]: any; destroyed$: Subject; diff --git a/libs/web/src/shared/services/shared.service.ts b/libs/web/src/shared/services/shared.service.ts index 252e58c9..6fba1b7b 100644 --- a/libs/web/src/shared/services/shared.service.ts +++ b/libs/web/src/shared/services/shared.service.ts @@ -1,10 +1,10 @@ import { Injectable, Injector } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { AppService } from '@rucken/core'; -import { IBaseService } from '@rucken/core'; @Injectable() -export class SharedService implements IBaseService { +export class SharedService { + [key: string]: any; app: AppService; translateService: TranslateService; From 3a6bd4f4dc21e54c39c5ec397d17de89ada0d54c Mon Sep 17 00:00:00 2001 From: endy Date: Wed, 20 Dec 2017 20:05:20 +0500 Subject: [PATCH 07/21] fix(base): Add @Input to title for base page and frame --- .../src/base/base-page/base-frame/base-frame.component.ts | 5 +++-- libs/web/src/base/base-page/base-page.component.ts | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libs/web/src/base/base-page/base-frame/base-frame.component.ts b/libs/web/src/base/base-page/base-frame/base-frame.component.ts index cf7cbd9b..d098895d 100644 --- a/libs/web/src/base/base-page/base-frame/base-frame.component.ts +++ b/libs/web/src/base/base-page/base-frame/base-frame.component.ts @@ -1,6 +1,6 @@ import { takeUntil } from 'rxjs/operators'; -import { Component, Injector } from '@angular/core'; +import { Component, Injector, Input } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { User } from '@rucken/core'; import * as _ from 'lodash'; @@ -14,6 +14,7 @@ import { TranslateService } from '@ngx-translate/core'; }) export class BaseFrameComponent extends BaseComponent { + @Input() title?: string; activatedRoute: ActivatedRoute; @@ -41,7 +42,7 @@ export class BaseFrameComponent extends BaseComponent { this.name = this.activatedRoute.snapshot.data.name; this.app.currentFrameName = this.name; } - if (this._title === undefined) { + if (this.title === undefined) { if (this.activatedRoute.snapshot.data.title) { frameTitle = this.translateService.instant(this.activatedRoute.snapshot.data.title); } else { diff --git a/libs/web/src/base/base-page/base-page.component.ts b/libs/web/src/base/base-page/base-page.component.ts index 7755435b..cf44a3e1 100644 --- a/libs/web/src/base/base-page/base-page.component.ts +++ b/libs/web/src/base/base-page/base-page.component.ts @@ -1,6 +1,6 @@ import { takeUntil } from 'rxjs/operators'; -import { Component, Injector } from '@angular/core'; +import { Component, Injector, Input } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { User } from '@rucken/core'; import * as _ from 'lodash'; @@ -14,7 +14,9 @@ import { BaseComponent } from './../base-component/base-component.component'; }) export class BasePageComponent extends BaseComponent { + @Input() title?: string; + @Input() searchTextValue = ''; activatedRoute: ActivatedRoute; @@ -54,7 +56,7 @@ export class BasePageComponent extends BaseComponent { this.name = this.activatedRoute.snapshot.data.name; this.app.currentPageName = this.activatedRoute.snapshot.data.name; } - if (this._title === undefined) { + if (this.title === undefined) { if (this.activatedRoute.snapshot.data.title) { pageTitle = this.translateService.instant(this.activatedRoute.snapshot.data.title); } else { From 5ce1ee2a0ac6eabfe6ef4bbd42782a26b7f51e9f Mon Sep 17 00:00:00 2001 From: endy Date: Mon, 8 Jan 2018 00:17:52 +0500 Subject: [PATCH 08/21] fix(styles): Remove custom styles like "app-grid-...." and others #101 --- .../app/controls/navbar/navbar.component.html | 14 +- apps/demo/src/styles.scss | 95 +-- .../base/base-page/base-page.component.html | 14 +- .../src/controls/navbar/navbar.component.html | 14 +- .../page-header/page-header.component.scss | 1 - .../content-types-grid.component.html | 26 +- .../fontawesomes-grid.component.html | 26 +- .../group-permissions-grid.component.html | 22 +- .../groups-grid/groups-grid.component.html | 30 +- .../permissions-grid.component.html | 30 +- .../user-groups-grid.component.html | 22 +- .../users-grid/users-grid.component.html | 34 +- .../themes-page/themes-page.component.html | 592 ++++++++++++------ 13 files changed, 553 insertions(+), 367 deletions(-) diff --git a/apps/demo/src/app/controls/navbar/navbar.component.html b/apps/demo/src/app/controls/navbar/navbar.component.html index 1388d26a..e64e270a 100644 --- a/apps/demo/src/app/controls/navbar/navbar.component.html +++ b/apps/demo/src/app/controls/navbar/navbar.component.html @@ -1,25 +1,25 @@ -