purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-01-08 03:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

(linting) Migrated over to the ESLint

Browse Source
This commit is contained in:
sercan 2021-05-14 17:17:06 +03:00
parent 0c5f5b9165
commit d159ae1458
182 changed files with 3543 additions and 2400 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
.eslintrc.json Normal file
View File

@ -0,0 +1,95 @@
{
"root": true,
"env": {
"es6": true
},
"parserOptions": {
"ecmaVersion": 2018
},
"ignorePatterns": [
"projects/**/*"
],
"overrides": [
{
"files": [
"*.ts"
],
"parserOptions": {
"project": [
"tsconfig.json",
"e2e/tsconfig.json"
],
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/template/process-inline-templates"
],
"rules": {
"@angular-eslint/component-selector": [
"error",
{
"type": "element",
"prefix": "",
"style": "kebab-case"
}
],
"@angular-eslint/directive-selector": [
"error",
{
"type": "attribute",
"prefix": "",
"style": "camelCase"
}
],
"@typescript-eslint/dot-notation": "off",
"@typescript-eslint/explicit-member-accessibility": [
"off",
{
"accessibility": "explicit"
}
],
"@typescript-eslint/no-inferrable-types": "off",
"arrow-parens": [
"error",
"as-needed",
{
"requireForBlockBody": true
}
],
"brace-style": [
"off",
"off"
],
"import/order": "off",
"max-len": [
"error",
{
"ignorePattern": "^import |^export | implements",
"code": 180
}
],
"no-underscore-dangle": "off",
"object-shorthand": "off",
"quote-props": [
"error",
"consistent"
],
"quotes": [
"error",
"single"
]
}
},
{
"files": [
"*.html"
],
"extends": [
"plugin:@angular-eslint/template/recommended"
],
"rules": {}
}
]
}

17
angular.json
View File

@ -126,15 +126,11 @@
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"builder": "@angular-eslint/builder:lint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
},
@ -153,5 +149,8 @@
}
}
},
"defaultProject": "fuse"
"defaultProject": "fuse",
"cli": {
"defaultCollection": "@angular-eslint/schematics"
}
}

1698
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

13
package.json
View File

@ -49,6 +49,11 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "12.0.0",
"@angular-eslint/builder": "12.0.0",
"@angular-eslint/eslint-plugin": "12.0.0",
"@angular-eslint/eslint-plugin-template": "12.0.0",
"@angular-eslint/schematics": "12.0.0",
"@angular-eslint/template-parser": "12.0.0",
"@angular/cli": "12.0.0",
"@angular/compiler-cli": "12.0.0",
"@angular/language-service": "12.0.0",
@ -62,9 +67,14 @@
"@types/lodash": "4.14.168",
"@types/lodash-es": "4.17.4",
"@types/node": "12.20.13",
"@typescript-eslint/eslint-plugin": "4.23.0",
"@typescript-eslint/parser": "4.23.0",
"autoprefixer": "10.2.5",
"chroma-js": "2.1.1",
"codelyzer": "6.0.1",
"eslint": "7.26.0",
"eslint-plugin-import": "2.23.0",
"eslint-plugin-jsdoc": "34.2.2",
"eslint-plugin-prefer-arrow": "1.2.3",
"jasmine-core": "3.7.1",
"jasmine-spec-reporter": "5.0.2",
"karma": "6.3.2",
@ -77,7 +87,6 @@
"protractor": "7.0.0",
"tailwindcss": "2.1.2",
"ts-node": "8.3.0",
"tslint": "6.1.3",
"typescript": "4.2.4"
}
}

14
src/@fuse/animations/defaults.ts
View File

@ -1,14 +1,14 @@
export class FuseAnimationCurves
{
static STANDARD_CURVE = 'cubic-bezier(0.4, 0.0, 0.2, 1)';
static DECELERATION_CURVE = 'cubic-bezier(0.0, 0.0, 0.2, 1)';
static ACCELERATION_CURVE = 'cubic-bezier(0.4, 0.0, 1, 1)';
static SHARP_CURVE = 'cubic-bezier(0.4, 0.0, 0.6, 1)';
static standard = 'cubic-bezier(0.4, 0.0, 0.2, 1)';
static deceleration = 'cubic-bezier(0.0, 0.0, 0.2, 1)';
static acceleration = 'cubic-bezier(0.4, 0.0, 1, 1)';
static sharp = 'cubic-bezier(0.4, 0.0, 0.6, 1)';
}
export class FuseAnimationDurations
{
static COMPLEX = '375ms';
static ENTERING = '225ms';
static EXITING = '195ms';
static complex = '375ms';
static entering = '225ms';
static exiting = '195ms';
}

2
src/@fuse/animations/expand-collapse.ts
View File

@ -24,7 +24,7 @@ const expandCollapse = trigger('expandCollapse',
animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)

20
src/@fuse/animations/fade.ts
View File

@ -25,7 +25,7 @@ const fadeIn = trigger('fadeIn',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -58,7 +58,7 @@ const fadeInTop = trigger('fadeInTop',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -91,7 +91,7 @@ const fadeInBottom = trigger('fadeInBottom',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -124,7 +124,7 @@ const fadeInLeft = trigger('fadeInLeft',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -157,7 +157,7 @@ const fadeInRight = trigger('fadeInRight',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -188,7 +188,7 @@ const fadeOut = trigger('fadeOut',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -221,7 +221,7 @@ const fadeOutTop = trigger('fadeOutTop',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -254,7 +254,7 @@ const fadeOutBottom = trigger('fadeOutBottom',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -287,7 +287,7 @@ const fadeOutLeft = trigger('fadeOutLeft',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -320,7 +320,7 @@ const fadeOutRight = trigger('fadeOutRight',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)

2
src/@fuse/animations/public-api.ts
View File

@ -4,7 +4,7 @@ import { shake } from './shake';
import { slideInBottom, slideInLeft, slideInRight, slideInTop, slideOutBottom, slideOutLeft, slideOutRight, slideOutTop } from './slide';
import { zoomIn, zoomOut } from './zoom';
export const FuseAnimations = [
export const fuseAnimations = [
expandCollapse,
fadeIn, fadeInTop, fadeInBottom, fadeInLeft, fadeInRight,
fadeOut, fadeOutTop, fadeOutBottom, fadeOutLeft, fadeOutRight,

16
src/@fuse/animations/slide.ts
View File

@ -25,7 +25,7 @@ const slideInTop = trigger('slideInTop',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -56,7 +56,7 @@ const slideInBottom = trigger('slideInBottom',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -87,7 +87,7 @@ const slideInLeft = trigger('slideInLeft',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -118,7 +118,7 @@ const slideInRight = trigger('slideInRight',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -149,7 +149,7 @@ const slideOutTop = trigger('slideOutTop',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -180,7 +180,7 @@ const slideOutBottom = trigger('slideOutBottom',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -211,7 +211,7 @@ const slideOutLeft = trigger('slideOutLeft',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)
@ -242,7 +242,7 @@ const slideOutRight = trigger('slideOutRight',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)

4
src/@fuse/animations/zoom.ts
View File

@ -28,7 +28,7 @@ const zoomIn = trigger('zoomIn',
transition('void => *', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.ENTERING} ${FuseAnimationCurves.DECELERATION_CURVE}`
timings: `${FuseAnimationDurations.entering} ${FuseAnimationCurves.deceleration}`
}
}
)
@ -62,7 +62,7 @@ const zoomOut = trigger('zoomOut',
transition('* => void', animate('{{timings}}'),
{
params: {
timings: `${FuseAnimationDurations.EXITING} ${FuseAnimationCurves.ACCELERATION_CURVE}`
timings: `${FuseAnimationDurations.exiting} ${FuseAnimationCurves.acceleration}`
}
}
)

10
src/@fuse/components/alert/alert.component.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Ho
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';
import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseAlertAppearance, FuseAlertType } from '@fuse/components/alert/alert.types';
import { FuseAlertService } from '@fuse/components/alert/alert.service';
import { FuseUtilsService } from '@fuse/services/utils/utils.service';
@ -13,14 +13,16 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
styleUrls : ['./alert.component.scss'],
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
animations : FuseAnimations,
animations : fuseAnimations,
exportAs : 'fuseAlert'
})
export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_dismissible: BooleanInput;
static ngAcceptInputType_dismissed: BooleanInput;
static ngAcceptInputType_showIcon: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() appearance: FuseAlertAppearance = 'soft';
@Input() dismissed: boolean = false;
@ -115,7 +117,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
// Subscribe to the dismiss calls
this._fuseAlertService.onDismiss
.pipe(
filter((name) => this.name === name),
filter(name => this.name === name),
takeUntil(this._unsubscribeAll)
)
.subscribe(() => {
@ -127,7 +129,7 @@ export class FuseAlertComponent implements OnChanges, OnInit, OnDestroy
// Subscribe to the show calls
this._fuseAlertService.onShow
.pipe(
filter((name) => this.name === name),
filter(name => this.name === name),
takeUntil(this._unsubscribeAll)
)
.subscribe(() => {

6
src/@fuse/components/card/card.component.ts
View File

@ -1,6 +1,6 @@
import { Component, HostBinding, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseCardFace } from '@fuse/components/card/card.types';
@Component({
@ -8,13 +8,15 @@ import { FuseCardFace } from '@fuse/components/card/card.types';
templateUrl : './card.component.html',
styleUrls : ['./card.component.scss'],
encapsulation: ViewEncapsulation.None,
animations : FuseAnimations,
animations : fuseAnimations,
exportAs : 'fuseCard'
})
export class FuseCardComponent implements OnChanges
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_expanded: BooleanInput;
static ngAcceptInputType_flippable: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() expanded: boolean = false;
@Input() face: FuseCardFace = 'front';

17
src/@fuse/components/date-range/date-range.component.ts
View File

@ -23,14 +23,14 @@ import { Moment } from 'moment';
})
export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnDestroy
{
@Output() readonly rangeChanged: EventEmitter<{ start: string, end: string }> = new EventEmitter<{ start: string; end: string }>();
@Output() readonly rangeChanged: EventEmitter<{ start: string; end: string }> = new EventEmitter<{ start: string; end: string }>();
@ViewChild('matMonthView1') private _matMonthView1: MatMonthView<any>;
@ViewChild('matMonthView2') private _matMonthView2: MatMonthView<any>;
@ViewChild('pickerPanelOrigin', {read: ElementRef}) private _pickerPanelOrigin: ElementRef;
@ViewChild('pickerPanel') private _pickerPanel: TemplateRef<any>;
@HostBinding('class.fuse-date-range') private _defaultClassNames = true;
activeDates: { month1: Moment | null, month2: Moment | null } = {
activeDates: { month1: Moment | null; month2: Moment | null } = {
month1: null,
month2: null
};
@ -41,7 +41,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD
private _onChange: (value: any) => void;
private _onTouched: (value: any) => void;
private _programmaticChange!: boolean;
private _range: { start: Moment | null, end: Moment | null } = {
private _range: { start: Moment | null; end: Moment | null } = {
start: null,
end : null
};
@ -330,7 +330,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD
*
* @param range
*/
writeValue(range: { start: string, end: string }): void
writeValue(range: { start: string; end: string }): void
{
// Set this change as a programmatic one
this._programmaticChange = true;
@ -481,11 +481,8 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD
*/
dateFilter(): any
{
return (date: Moment): boolean => {
// If we are selecting the end date, disable all the dates that comes before the start date
return !(this.setWhichDate === 'end' && date.isBefore(this._range.start, 'day'));
};
// If we are selecting the end date, disable all the dates that comes before the start date
return (date: Moment): boolean => !(this.setWhichDate === 'end' && date.isBefore(this._range.start, 'day'));
}
/**
@ -667,7 +664,7 @@ export class FuseDateRangeComponent implements ControlValueAccessor, OnInit, OnD
private _parseTime(value: string): Moment
{
// Parse the time using the time regexp
const timeArr = value.split(this._timeRegExp).filter((part) => part !== '');
const timeArr = value.split(this._timeRegExp).filter(part => part !== '');
// Get the meridiem
const meridiem = timeArr[2] || null;

66
src/@fuse/components/drawer/drawer.component.ts
View File

@ -14,9 +14,11 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
})
export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_fixed: BooleanInput;
static ngAcceptInputType_opened: BooleanInput;
static ngAcceptInputType_transparentOverlay: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() fixed: boolean = false;
@Input() mode: FuseDrawerMode = 'side';
@ -76,6 +78,40 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
};
}
// -----------------------------------------------------------------------------------------------------
// @ Decorated methods
// -----------------------------------------------------------------------------------------------------
/**
* On mouseenter
*
* @private
*/
@HostListener('mouseenter')
private _onMouseenter(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = true;
}
/**
* On mouseleave
*
* @private
*/
@HostListener('mouseleave')
private _onMouseleave(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = false;
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
@ -347,36 +383,6 @@ export class FuseDrawerComponent implements OnChanges, OnInit, OnDestroy
});
}
/**
* On mouseenter
*
* @private
*/
@HostListener('mouseenter')
private _onMouseenter(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = true;
}
/**
* On mouseleave
*
* @private
*/
@HostListener('mouseleave')
private _onMouseleave(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = false;
}
/**
* Open/close the drawer
*

4
src/@fuse/components/highlight/highlight.service.ts
View File

@ -60,7 +60,7 @@ export class FuseHighlightService
}
// Iterate through the lines
lines.filter((line) => line.length)
lines.filter(line => line.length)
.forEach((line, index) => {
// Always get the indentation of the first line so we can
@ -77,6 +77,6 @@ export class FuseHighlightService
// Iterate through the lines one more time, remove the extra
// indentation, join them together and return it
return lines.map((line) => line.substring(indentation)).join('\n');
return lines.map(line => line.substring(indentation)).join('\n');
}
}

4
src/@fuse/components/masonry/masonry.component.ts
View File

@ -1,5 +1,5 @@
import { AfterViewInit, Component, Input, OnChanges, SimpleChanges, TemplateRef, ViewEncapsulation } from '@angular/core';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
@Component({
@ -7,7 +7,7 @@ import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
templateUrl : './masonry.component.html',
styleUrls : ['./masonry.component.scss'],
encapsulation: ViewEncapsulation.None,
animations : FuseAnimations,
animations : fuseAnimations,
exportAs : 'fuseMasonry'
})
export class FuseMasonryComponent implements OnChanges, AfterViewInit

2
src/@fuse/components/navigation/horizontal/components/branch/branch.component.ts
View File

@ -15,7 +15,9 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
})
export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_child: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() child: boolean = false;
@Input() item: FuseNavigationItem;

4
src/@fuse/components/navigation/horizontal/horizontal.component.ts
View File

@ -1,6 +1,6 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { ReplaySubject, Subject } from 'rxjs';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
import { FuseUtilsService } from '@fuse/services/utils/utils.service';
@ -9,7 +9,7 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
selector : 'fuse-horizontal-navigation',
templateUrl : './horizontal.component.html',
styleUrls : ['./horizontal.component.scss'],
animations : FuseAnimations,
animations : fuseAnimations,
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
exportAs : 'fuseHorizontalNavigation'

2
src/@fuse/components/navigation/navigation.service.ts
View File

@ -67,7 +67,6 @@ export class FuseNavigationService
* Get navigation from storage by key
*
* @param key
* @returns {any}
*/
getNavigation(key: string): FuseNavigationItem[]
{
@ -97,7 +96,6 @@ export class FuseNavigationService
*
* @param navigation
* @param flatNavigation
* @returns {FuseNavigationItem[]}
*/
getFlatNavigation(navigation: FuseNavigationItem[], flatNavigation: FuseNavigationItem[] = []): FuseNavigationItem[]
{

32
src/@fuse/components/navigation/vertical/components/aside/aside.component.ts
View File

@ -15,8 +15,10 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
})
export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_autoCollapse: BooleanInput;
static ngAcceptInputType_skipChildren: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() activeItemId: string;
@Input() autoCollapse: boolean;
@ -101,6 +103,21 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
this._unsubscribeAll.complete();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Track by function for ngFor loops
*
* @param index
* @param item
*/
trackByFn(index: number, item: any): any
{
return item.id || index;
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
@ -168,19 +185,4 @@ export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnIn
// Mark for check
this._changeDetectorRef.markForCheck();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Track by function for ngFor loops
*
* @param index
* @param item
*/
trackByFn(index: number, item: any): any
{
return item.id || index;
}
}

161
src/@fuse/components/navigation/vertical/components/collapsable/collapsable.component.ts
View File

@ -3,7 +3,7 @@ import { NavigationEnd, Router } from '@angular/router';
import { BooleanInput } from '@angular/cdk/coercion';
import { Subject } from 'rxjs';
import { filter, takeUntil } from 'rxjs/operators';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseVerticalNavigationComponent } from '@fuse/components/navigation/vertical/vertical.component';
import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types';
@ -12,12 +12,14 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
selector : 'fuse-vertical-navigation-collapsable-item',
templateUrl : './collapsable.component.html',
styles : [],
animations : FuseAnimations,
animations : fuseAnimations,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_autoCollapse: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() autoCollapse: boolean;
@Input() item: FuseNavigationItem;
@ -179,84 +181,6 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
this._unsubscribeAll.complete();
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check if the given item has the given url
* in one of its children
*
* @param item
* @param currentUrl
* @private
*/
private _hasActiveChild(item: FuseNavigationItem, currentUrl: string): boolean
{
const children = item.children;
if ( !children )
{
return false;
}
for ( const child of children )
{
if ( child.children )
{
if ( this._hasActiveChild(child, currentUrl) )
{
return true;
}
}
// Check if the child has a link and is active
if ( child.link && this._router.isActive(child.link, child.exactMatch || false) )
{
return true;
}
}
return false;
}
/**
* Check if this is a children
* of the given item
*
* @param parent
* @param item
* @return {boolean}
* @private
*/
private _isChildrenOf(parent: FuseNavigationItem, item: FuseNavigationItem): boolean
{
const children = parent.children;
if ( !children )
{
return false;
}
if ( children.indexOf(item) > -1 )
{
return true;
}
for ( const child of children )
{
if ( child.children )
{
if ( this._isChildrenOf(child, item) )
{
return true;
}
}
}
return false;
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
@ -343,4 +267,81 @@ export class FuseVerticalNavigationCollapsableItemComponent implements OnInit, O
{
return item.id || index;
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check if the given item has the given url
* in one of its children
*
* @param item
* @param currentUrl
* @private
*/
private _hasActiveChild(item: FuseNavigationItem, currentUrl: string): boolean
{
const children = item.children;
if ( !children )
{
return false;
}
for ( const child of children )
{
if ( child.children )
{
if ( this._hasActiveChild(child, currentUrl) )
{
return true;
}
}
// Check if the child has a link and is active
if ( child.link && this._router.isActive(child.link, child.exactMatch || false) )
{
return true;
}
}
return false;
}
/**
* Check if this is a children
* of the given item
*
* @param parent
* @param item
* @private
*/
private _isChildrenOf(parent: FuseNavigationItem, item: FuseNavigationItem): boolean
{
const children = parent.children;
if ( !children )
{
return false;
}
if ( children.indexOf(item) > -1 )
{
return true;
}
for ( const child of children )
{
if ( child.children )
{
if ( this._isChildrenOf(child, item) )
{
return true;
}
}
}
return false;
}
}

2
src/@fuse/components/navigation/vertical/components/group/group.component.ts
View File

@ -14,7 +14,9 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
})
export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_autoCollapse: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() autoCollapse: boolean;
@Input() item: FuseNavigationItem;

70
src/@fuse/components/navigation/vertical/vertical.component.ts
View File

@ -4,7 +4,7 @@ import { NavigationEnd, Router } from '@angular/router';
import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay';
import { merge, ReplaySubject, Subject, Subscription } from 'rxjs';
import { delay, filter, takeUntil } from 'rxjs/operators';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { FuseNavigationItem, FuseVerticalNavigationAppearance, FuseVerticalNavigationMode, FuseVerticalNavigationPosition } from '@fuse/components/navigation/navigation.types';
import { FuseNavigationService } from '@fuse/components/navigation/navigation.service';
import { FuseScrollbarDirective } from '@fuse/directives/scrollbar/scrollbar.directive';
@ -15,16 +15,18 @@ import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion';
selector : 'fuse-vertical-navigation',
templateUrl : './vertical.component.html',
styleUrls : ['./vertical.component.scss'],
animations : FuseAnimations,
animations : fuseAnimations,
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
exportAs : 'fuseVerticalNavigation'
})
export class FuseVerticalNavigationComponent implements OnChanges, OnInit, AfterViewInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_inner: BooleanInput;
static ngAcceptInputType_opened: BooleanInput;
static ngAcceptInputType_transparentOverlay: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() appearance: FuseVerticalNavigationAppearance = 'default';
@Input() autoCollapse: boolean = true;
@ -151,6 +153,40 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
});
}
// -----------------------------------------------------------------------------------------------------
// @ Decorated methods
// -----------------------------------------------------------------------------------------------------
/**
* On mouseenter
*
* @private
*/
@HostListener('mouseenter')
private _onMouseenter(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = true;
}
/**
* On mouseleave
*
* @private
*/
@HostListener('mouseleave')
private _onMouseleave(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = false;
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
@ -672,36 +708,6 @@ export class FuseVerticalNavigationComponent implements OnChanges, OnInit, After
});
}
/**
* On mouseenter
*
* @private
*/
@HostListener('mouseenter')
private _onMouseenter(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = true;
}
/**
* On mouseleave
*
* @private
*/
@HostListener('mouseleave')
private _onMouseleave(): void
{
// Enable the animations
this._enableAnimations();
// Set the hovered
this._hovered = false;
}
/**
* Open/close the navigation
*

68
src/@fuse/directives/autogrow/autogrow.directive.ts
View File

@ -7,7 +7,7 @@ import { Subject } from 'rxjs';
})
export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy
{
// tslint:disable-next-line:no-input-rename
// eslint-disable-next-line @angular-eslint/no-input-rename
@Input('fuseAutogrowVerticalPadding') padding: number = 8;
@HostBinding('rows') private _rows: number = 1;
@ -41,6 +41,39 @@ export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy
};
}
// -----------------------------------------------------------------------------------------------------
// @ Decorated methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resize(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this._height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this._height = `${this._elementRef.nativeElement.scrollHeight - this.padding}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
@ -78,37 +111,4 @@ export class FuseAutogrowDirective implements OnChanges, OnInit, OnDestroy
this._unsubscribeAll.next();
this._unsubscribeAll.complete();
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resize(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this._height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this._height = `${this._elementRef.nativeElement.scrollHeight - this.padding}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
}

34
src/@fuse/directives/scrollbar/scrollbar.directive.ts
View File

@ -17,7 +17,9 @@ import { ScrollbarGeometry, ScrollbarPosition } from '@fuse/directives/scrollbar
})
export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_fuseScrollbar: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() fuseScrollbar: boolean = true;
@Input() fuseScrollbarOptions: PerfectScrollbar.Options;
@ -246,8 +248,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to X
*
* @param {number} x
* @param {number} speed
* @param x
* @param speed
*/
scrollToX(x: number, speed?: number): void
{
@ -257,8 +259,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to Y
*
* @param {number} y
* @param {number} speed
* @param y
* @param speed
*/
scrollToY(y: number, speed?: number): void
{
@ -268,8 +270,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to top
*
* @param {number} offset
* @param {number} speed
* @param offset
* @param speed
*/
scrollToTop(offset: number = 0, speed?: number): void
{
@ -279,8 +281,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to bottom
*
* @param {number} offset
* @param {number} speed
* @param offset
* @param speed
*/
scrollToBottom(offset: number = 0, speed?: number): void
{
@ -291,8 +293,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to left
*
* @param {number} offset
* @param {number} speed
* @param offset
* @param speed
*/
scrollToLeft(offset: number = 0, speed?: number): void
{
@ -302,8 +304,8 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to right
*
* @param {number} offset
* @param {number} speed
* @param offset
* @param speed
*/
scrollToRight(offset: number = 0, speed?: number): void
{
@ -314,10 +316,10 @@ export class FuseScrollbarDirective implements OnChanges, OnInit, OnDestroy
/**
* Scroll to element
*
* @param {string} qs
* @param {number} offset
* @param {boolean} ignoreVisible If true, scrollToElement won't happen if element is already inside the current viewport
* @param {number} speed
* @param qs
* @param offset
* @param ignoreVisible If true, scrollToElement won't happen if element is already inside the current viewport
* @param speed
*/
scrollToElement(qs: string, offset: number = 0, ignoreVisible: boolean = false, speed?: number): void
{

26
src/@fuse/lib/mock-api/mock-api.service.ts
View File

@ -9,11 +9,11 @@ import { FuseMockApiMethods } from '@fuse/lib/mock-api/mock-api.types';
export class FuseMockApiService
{
private _handlers: { [key: string]: Map<string, FuseMockApiHandler> } = {
DELETE: new Map<string, FuseMockApiHandler>(),
GET : new Map<string, FuseMockApiHandler>(),
PATCH : new Map<string, FuseMockApiHandler>(),
POST : new Map<string, FuseMockApiHandler>(),
PUT : new Map<string, FuseMockApiHandler>()
'delete': new Map<string, FuseMockApiHandler>(),
'get' : new Map<string, FuseMockApiHandler>(),
'patch' : new Map<string, FuseMockApiHandler>(),
'post' : new Map<string, FuseMockApiHandler>(),
'put' : new Map<string, FuseMockApiHandler>()
};
/**
@ -34,10 +34,10 @@ export class FuseMockApiService
* @param method
* @param url
*/
findHandler(method: string, url: string): { handler: FuseMockApiHandler | undefined, urlParams: { [key: string]: string } }
findHandler(method: string, url: string): { handler: FuseMockApiHandler | undefined; urlParams: { [key: string]: string } }
{
// Prepare the return object
const matchingHandler: { handler: FuseMockApiHandler | undefined, urlParams: { [key: string]: string } } = {
const matchingHandler: { handler: FuseMockApiHandler | undefined; urlParams: { [key: string]: string } } = {
handler : undefined,
urlParams: {}
};
@ -46,7 +46,7 @@ export class FuseMockApiService
const urlParts = url.split('/');
// Get all related request handlers
const handlers = this._handlers[method.toUpperCase()];
const handlers = this._handlers[method.toLowerCase()];
// Iterate through the handlers
handlers.forEach((handler, handlerUrl) => {
@ -93,7 +93,7 @@ export class FuseMockApiService
*/
onDelete(url: string, delay?: number): FuseMockApiHandler
{
return this._registerHandler('DELETE', url, delay);
return this._registerHandler('delete', url, delay);
}
/**
@ -104,7 +104,7 @@ export class FuseMockApiService
*/
onGet(url: string, delay?: number): FuseMockApiHandler
{
return this._registerHandler('GET', url, delay);
return this._registerHandler('get', url, delay);
}
/**
@ -115,7 +115,7 @@ export class FuseMockApiService
*/
onPatch(url: string, delay?: number): FuseMockApiHandler
{
return this._registerHandler('PATCH', url, delay);
return this._registerHandler('patch', url, delay);
}
/**
@ -126,7 +126,7 @@ export class FuseMockApiService
*/
onPost(url: string, delay?: number): FuseMockApiHandler
{
return this._registerHandler('POST', url, delay);
return this._registerHandler('post', url, delay);
}
/**
@ -137,7 +137,7 @@ export class FuseMockApiService
*/
onPut(url: string, delay?: number): FuseMockApiHandler
{
return this._registerHandler('PUT', url, delay);
return this._registerHandler('put', url, delay);
}
// -----------------------------------------------------------------------------------------------------

10
src/@fuse/lib/mock-api/mock-api.types.ts
View File

@ -6,8 +6,8 @@ export type FuseMockApiReplyCallback =
| undefined;
export type FuseMockApiMethods =
| 'GET'
| 'POST'
| 'PUT'
| 'PATCH'
| 'DELETE';
| 'get'
| 'post'
| 'put'
| 'patch'
| 'delete';

4
src/@fuse/lib/mock-api/mock-api.utils.ts
View File

@ -16,7 +16,7 @@ export class FuseMockApiUtils
*/
static guid(): string
{
/* tslint:disable */
/* eslint-disable */
let d = new Date().getTime();
@ -32,6 +32,6 @@ export class FuseMockApiUtils
return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
});
/* tslint:enable */
/* eslint-enable */
}
}

4
src/@fuse/pipes/find-by-key/find-by-key.pipe.ts
View File

@ -28,9 +28,7 @@ export class FuseFindByKeyPipe implements PipeTransform
// If the given value is an array of strings...
if ( Array.isArray(value) )
{
return value.map((item) => {
return source.find((sourceItem) => sourceItem[key] === item);
});
return value.map(item => source.find(sourceItem => sourceItem[key] === item));
}
// If the value is a string...

6
src/@fuse/services/media-watcher/media-watcher.service.ts
View File

@ -7,7 +7,7 @@ import { FuseTailwindService } from '@fuse/services/tailwind/tailwind.service';
@Injectable()
export class FuseMediaWatcherService
{
private _onMediaChange: ReplaySubject<{ matchingAliases: string[], matchingQueries: any }> = new ReplaySubject<{ matchingAliases: string[], matchingQueries: any }>(1);
private _onMediaChange: ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }> = new ReplaySubject<{ matchingAliases: string[]; matchingQueries: any }>(1);
/**
* Constructor
@ -18,7 +18,7 @@ export class FuseMediaWatcherService
)
{
this._fuseTailwindConfigService.tailwindConfig$.pipe(
switchMap((config) => this._breakpointObserver.observe(Object.values(config.breakpoints)).pipe(
switchMap(config => this._breakpointObserver.observe(Object.values(config.breakpoints)).pipe(
map((state) => {
// Prepare the observable values and set their defaults
@ -57,7 +57,7 @@ export class FuseMediaWatcherService
/**
* Getter for _onMediaChange
*/
get onMediaChange$(): Observable<{ matchingAliases: string[], matchingQueries: any }>
get onMediaChange$(): Observable<{ matchingAliases: string[]; matchingQueries: any }>
{
return this._onMediaChange.asObservable();
}

3
src/@fuse/version/fuse-version.ts
View File

@ -1,4 +1,3 @@
import { Version } from '@fuse/version/version';
const __FUSE_VERSION__ = '12.3.0';
export const FUSE_VERSION = new Version(__FUSE_VERSION__).full;
export const FUSE_VERSION = new Version('12.3.0').full;

2
src/app/app.routing.ts
View File

@ -5,7 +5,7 @@ import { LayoutComponent } from 'app/layout/layout.component';
import { InitialDataResolver } from 'app/app.resolvers';
// @formatter:off
// tslint:disable:max-line-length
/* eslint-disable max-len */
export const appRoutes: Route[] = [
// Redirect empty path to '/dashboards/project'

8
src/app/app.types.ts
View File

@ -8,10 +8,10 @@ export interface InitialData
{
messages: Message[];
navigation: {
compact: FuseNavigationItem[],
default: FuseNavigationItem[],
futuristic: FuseNavigationItem[],
horizontal: FuseNavigationItem[]
compact: FuseNavigationItem[];
default: FuseNavigationItem[];
futuristic: FuseNavigationItem[];
horizontal: FuseNavigationItem[];
};
notifications: Notification[];
shortcuts: Shortcut[];

24
src/app/core/auth/auth.service.ts
View File

@ -29,12 +29,12 @@ export class AuthService
*/
set accessToken(token: string)
{
localStorage.setItem('access_token', token);
localStorage.setItem('accessToken', token);
}
get accessToken(): string
{
return localStorage.getItem('access_token') ?? '';
return localStorage.getItem('accessToken') ?? '';
}
// -----------------------------------------------------------------------------------------------------
@ -66,7 +66,7 @@ export class AuthService
*
* @param credentials
*/
signIn(credentials: { email: string, password: string }): Observable<any>
signIn(credentials: { email: string; password: string }): Observable<any>
{
// Throw error, if the user is already logged in
if ( this._authenticated )
@ -78,7 +78,7 @@ export class AuthService
switchMap((response: any) => {
// Store the access token in the local storage
this.accessToken = response.access_token;
this.accessToken = response.accessToken;
// Set the authenticated flag to true
this._authenticated = true;
@ -99,17 +99,17 @@ export class AuthService
{
// Renew token
return this._httpClient.post('api/auth/refresh-access-token', {
access_token: this.accessToken
accessToken: this.accessToken
}).pipe(
catchError(() => {
catchError(() =>
// Return false
return of(false);
}),
of(false)
),
switchMap((response: any) => {
// Store the access token in the local storage
this.accessToken = response.access_token;
this.accessToken = response.accessToken;
// Set the authenticated flag to true
this._authenticated = true;
@ -129,7 +129,7 @@ export class AuthService
signOut(): Observable<any>
{
// Remove the access token from the local storage
localStorage.removeItem('access_token');
localStorage.removeItem('accessToken');
// Set the authenticated flag to false
this._authenticated = false;
@ -143,7 +143,7 @@ export class AuthService
*
* @param user
*/
signUp(user: { name: string, email: string, password: string, company: string }): Observable<any>
signUp(user: { name: string; email: string; password: string; company: string }): Observable<any>
{
return this._httpClient.post('api/auth/sign-up', user);
}
@ -153,7 +153,7 @@ export class AuthService
*
* @param credentials
*/
unlockSession(credentials: { email: string, password: string }): Observable<any>
unlockSession(credentials: { email: string; password: string }): Observable<any>
{
return this._httpClient.post('api/auth/unlock-session', credentials);
}

72
src/app/core/auth/auth.utils.ts
View File

@ -14,6 +14,38 @@ export class AuthUtils
{
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Is token expired?
*
* @param token
* @param offsetSeconds
*/
static isTokenExpired(token: string, offsetSeconds?: number): boolean
{
// Return if there is no token
if ( !token || token === '' )
{
return true;
}
// Get the expiration date
const date = this._getTokenExpirationDate(token);
offsetSeconds = offsetSeconds || 0;
if ( date === null )
{
return true;
}
// Check if the token is expired
return !(date.valueOf() > new Date().valueOf() + offsetSeconds * 1000);
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
@ -39,7 +71,7 @@ export class AuthUtils
);
}
/* tslint:disable */
/* eslint-disable */
for (
// initialize result and counters
let bc = 0, bs: any, buffer: any, idx = 0;
@ -60,7 +92,7 @@ export class AuthUtils
// try to find character in table (0-63, not found => -1)
buffer = chars.indexOf(buffer);
}
/* tslint:enable */
/* eslint-enable */
return output;
}
@ -75,9 +107,7 @@ export class AuthUtils
{
return decodeURIComponent(
Array.prototype.map
.call(this._b64decode(str), (c: any) => {
return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
})
.call(this._b64decode(str), (c: any) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
.join('')
);
}
@ -171,36 +201,4 @@ export class AuthUtils
return date;
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Is token expired?
*
* @param token
* @param offsetSeconds
*/
static isTokenExpired(token: string, offsetSeconds?: number): boolean
{
// Return if there is no token
if ( !token || token === '' )
{
return true;
}
// Get the expiration date
const date = this._getTokenExpirationDate(token);
offsetSeconds = offsetSeconds || 0;
if ( date === null )
{
return true;
}
// Check if the token is expired
return !(date.valueOf() > new Date().valueOf() + offsetSeconds * 1000);
}
}

66
src/app/core/auth/guards/auth.guard.ts
View File

@ -19,39 +19,6 @@ export class AuthGuard implements CanActivate, CanActivateChild, CanLoad
{
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check the authenticated status
*
* @param redirectURL
* @private
*/
private _check(redirectURL: string): Observable<boolean>
{
// Check the authentication status
return this._authService.check()
.pipe(
switchMap((authenticated) => {
// If the user is not authenticated...
if ( !authenticated )
{
// Redirect to the sign-in page
this._router.navigate(['sign-in'], {queryParams: {redirectURL}});
// Prevent the access
return of(false);
}
// Allow the access
return of(true);
})
);
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
@ -90,4 +57,37 @@ export class AuthGuard implements CanActivate, CanActivateChild, CanLoad
{
return this._check('/');
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check the authenticated status
*
* @param redirectURL
* @private
*/
private _check(redirectURL: string): Observable<boolean>
{
// Check the authentication status
return this._authService.check()
.pipe(
switchMap((authenticated) => {
// If the user is not authenticated...
if ( !authenticated )
{
// Redirect to the sign-in page
this._router.navigate(['sign-in'], {queryParams: {redirectURL}});
// Prevent the access
return of(false);
}
// Allow the access
return of(true);
})
);
}
}

64
src/app/core/auth/guards/noAuth.guard.ts
View File

@ -19,38 +19,6 @@ export class NoAuthGuard implements CanActivate, CanActivateChild, CanLoad
{
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check the authenticated status
*
* @private
*/
private _check(): Observable<boolean>
{
// Check the authentication status
return this._authService.check()
.pipe(
switchMap((authenticated) => {
// If the user is authenticated...
if ( authenticated )
{
// Redirect to the root
this._router.navigate(['']);
// Prevent the access
return of(false);
}
// Allow the access
return of(true);
})
);
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
@ -87,4 +55,36 @@ export class NoAuthGuard implements CanActivate, CanActivateChild, CanLoad
{
return this._check();
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Check the authenticated status
*
* @private
*/
private _check(): Observable<boolean>
{
// Check the authentication status
return this._authService.check()
.pipe(
switchMap((authenticated) => {
// If the user is authenticated...
if ( authenticated )
{
// Redirect to the root
this._router.navigate(['']);
// Prevent the access
return of(false);
}
// Allow the access
return of(true);
})
);
}
}

13
src/app/layout/common/search/search.component.ts
View File

@ -3,14 +3,14 @@ import { FormControl } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { Subject } from 'rxjs';
import { debounceTime, filter, map, takeUntil } from 'rxjs/operators';
import { FuseAnimations } from '@fuse/animations/public-api';
import { fuseAnimations } from '@fuse/animations/public-api';
@Component({
selector : 'search',
templateUrl : './search.component.html',
encapsulation: ViewEncapsulation.None,
exportAs : 'fuseSearch',
animations : FuseAnimations
animations : fuseAnimations
})
export class SearchComponent implements OnChanges, OnInit, OnDestroy
{
@ -115,12 +115,9 @@ export class SearchComponent implements OnChanges, OnInit, OnDestroy
// Continue
return value;
}),
filter((value) => {
// Filter out undefined/null/false statements and also
// filter out the values that are smaller than minLength
return value && value.length >= this.minLength;
})
// Filter out undefined/null/false statements and also
// filter out the values that are smaller than minLength
filter(value => value && value.length >= this.minLength)
)
.subscribe((value) => {
this._httpClient.post('api/common/search', {query: value})

4
src/app/layout/common/search/search.module.ts
View File

@ -28,9 +28,7 @@ import { SearchComponent } from 'app/layout/common/search/search.component';
providers : [
{
provide : MAT_AUTOCOMPLETE_SCROLL_STRATEGY,
useFactory: (overlay: Overlay) => {
return () => overlay.scrollStrategies.block();
},
useFactory: (overlay: Overlay) => () => overlay.scrollStrategies.block(),
deps : [Overlay]
}
]

2
src/app/layout/common/user-menu/user-menu.component.ts
View File

@ -15,7 +15,9 @@ import { UserService } from 'app/core/user/user.service';
})
export class UserMenuComponent implements OnInit, OnDestroy
{
/* eslint-disable @typescript-eslint/naming-convention */
static ngAcceptInputType_showAvatar: BooleanInput;
/* eslint-enable @typescript-eslint/naming-convention */
@Input() showAvatar: boolean = true;
user: User;

2
src/app/mock-api/apps/academy/api.ts
View File

@ -74,7 +74,7 @@ export class AcademyMockApi
const steps = cloneDeep(this._demoCourseSteps);
// Find the course and attach steps to it
const course = courses.find((item) => item.id === id);
const course = courses.find(item => item.id === id);
if ( course )
{
course.steps = steps;

2
src/app/mock-api/apps/academy/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const categories = [
{
id : '9a67dff7-3c38-4052-a335-0cef93438ff6',

14
src/app/mock-api/apps/calendar/api.ts
View File

@ -110,11 +110,11 @@ export class CalendarMockApi
const id = request.params.get('id');
// Find the calendar and delete it
const index = this._calendars.findIndex((calendar) => calendar.id === id);
const index = this._calendars.findIndex(calendar => calendar.id === id);
this._calendars.splice(index, 1);
// Find the events that belong to the calendar and remove them as well
this._events = this._events.filter((event) => event.calendarId !== id);
this._events = this._events.filter(event => event.calendarId !== id);
// Return the response
return [200, true];
@ -287,7 +287,7 @@ export class CalendarMockApi
const id = request.params.get('id');
// Find the event and delete it
const index = this._events.findIndex((item) => item.id === id);
const index = this._events.findIndex(item => item.id === id);
this._events.splice(index, 1);
// Return the response
@ -307,7 +307,7 @@ export class CalendarMockApi
const mode = request.body.mode;
// Find the original recurring event from db
const recurringEvent = this._events.find((item) => item.id === event.recurringEventId);
const recurringEvent = this._events.find(item => item.id === event.recurringEventId);
// Single
if ( mode === 'single' )
@ -406,7 +406,7 @@ export class CalendarMockApi
if ( mode === 'all' )
{
// Find the event index
const eventIndex = this._events.findIndex((item) => item.id === event.recurringEventId);
const eventIndex = this._events.findIndex(item => item.id === event.recurringEventId);
// Update the recurring event
this._events[eventIndex] = assign({}, this._events[eventIndex], omit(event, ['id', 'recurringEventId', 'range']));
@ -428,7 +428,7 @@ export class CalendarMockApi
const mode = request.params.get('mode');
// Find the recurring event
const recurringEvent = this._events.find((item) => item.id === event.recurringEventId);
const recurringEvent = this._events.find(item => item.id === event.recurringEventId);
// Single
if ( mode === 'single' )
@ -495,7 +495,7 @@ export class CalendarMockApi
if ( mode === 'all' )
{
// Find the event and delete it
const index = this._events.findIndex((item) => item.id === event.recurringEventId);
const index = this._events.findIndex(item => item.id === event.recurringEventId);
this._events.splice(index, 1);
}

2
src/app/mock-api/apps/calendar/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */
import * as moment from 'moment';
/* tslint:disable:max-line-length */
export const calendars = [
{
id : '1a470c8e-40ed-4c2d-b590-a4f1f6ead6cc',

12
src/app/mock-api/apps/chat/api.ts
View File

@ -22,12 +22,12 @@ export class ChatMockApi
this.registerHandlers();
// Modify the chats array to attach certain data to it
this._chats = this._chats.map((chat) => ({
this._chats = this._chats.map(chat => ({
...chat,
// Get the actual contact object from the id and attach it to the chat
contact: this._contacts.find((contact) => contact.id === chat.contactId),
contact: this._contacts.find(contact => contact.id === chat.contactId),
// Since we use same set of messages on all chats, we assign them here.
messages: this._messages.map((message) => ({
messages: this._messages.map(message => ({
...message,
chatId : chat.id,
contactId: message.contactId === 'me' ? this._profile.id : chat.contactId,
@ -73,7 +73,7 @@ export class ChatMockApi
const chats = cloneDeep(this._chats);
// Find the chat we need
const chat = chats.find((item) => item.id === id);
const chat = chats.find(item => item.id === id);
// Return the response
return [200, chat];
@ -124,7 +124,7 @@ export class ChatMockApi
contacts.sort((a, b) => a.name.localeCompare(b.name));
// Omit details and attachments from contacts
contacts = contacts.map((contact) => omit(contact, ['details', 'attachments']));
contacts = contacts.map(contact => omit(contact, ['details', 'attachments']));
// Return the response
return [200, contacts];
@ -144,7 +144,7 @@ export class ChatMockApi
const contacts = cloneDeep(this._contacts);
// Find the contact
const contact = contacts.find((item) => item.id === id);
const contact = contacts.find(item => item.id === id);
// Return the response
return [200, contact];

1034
src/app/mock-api/apps/chat/data.ts
View File

File diff suppressed because it is too large Load Diff

14
src/app/mock-api/apps/contacts/api.ts
View File

@ -66,7 +66,7 @@ export class ContactsMockApi
if ( query )
{
// Filter the contacts
contacts = contacts.filter((contact) => contact.name && contact.name.toLowerCase().includes(query.toLowerCase()));
contacts = contacts.filter(contact => contact.name && contact.name.toLowerCase().includes(query.toLowerCase()));
}
// Sort the contacts by the name field by default
@ -90,9 +90,7 @@ export class ContactsMockApi
const contacts = cloneDeep(this._contacts);
// Find the contact
const contact = contacts.find((item) => {
return item.id === id;
});
const contact = contacts.find(item => item.id === id);
// Return the response
return [200, contact];
@ -288,10 +286,10 @@ export class ContactsMockApi
*
* @param file
*/
const readAsDataURL = (file: File): Promise<any> => {
const readAsDataURL = (file: File): Promise<any> =>
// Return a new promise
return new Promise((resolve, reject) => {
new Promise((resolve, reject) => {
// Create a new reader
const reader = new FileReader();
@ -308,8 +306,8 @@ export class ContactsMockApi
// Read the file as the
reader.readAsDataURL(file);
});
};
})
;
this._fuseMockApiService
.onPost('api/apps/contacts/avatar')

1034
src/app/mock-api/apps/contacts/data.ts
View File

File diff suppressed because it is too large Load Diff

8
src/app/mock-api/apps/ecommerce/inventory/api.ts
View File

@ -81,9 +81,7 @@ export class ECommerceInventoryMockApi
if ( search )
{
// Filter the products
products = products.filter((contact) => {
return contact.name && contact.name.toLowerCase().includes(search.toLowerCase());
});
products = products.filter(contact => contact.name && contact.name.toLowerCase().includes(search.toLowerCase()));
}
// Paginate - Start
@ -148,9 +146,7 @@ export class ECommerceInventoryMockApi
const products = cloneDeep(this._products);
// Find the product
const product = products.find((item) => {
return item.id === id;
});
const product = products.find(item => item.id === id);
// Return the response
return [200, product];

2
src/app/mock-api/apps/ecommerce/inventory/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const categories = [
{
id : 'b899ec30-b85a-40ab-bb1f-18a596d5c6de',

4
src/app/mock-api/apps/file-manager/api.ts
View File

@ -39,8 +39,8 @@ export class FileManagerMockApi
const items = cloneDeep(this._items);
// Separate the items by folders and files
const folders = items.filter((item) => item.type === 'folder');
const files = items.filter((item) => item.type !== 'folder');
const folders = items.filter(item => item.type === 'folder');
const files = items.filter(item => item.type !== 'folder');
// Sort the folders and files alphabetically by filename
folders.sort((a, b) => a.name.localeCompare(b.name));

4
src/app/mock-api/apps/file-manager/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const items = [
{
id : 'cd6897cb-acfd-4016-8b53-3f66a5b5fc68',
@ -175,5 +175,5 @@ export const items = [
type : 'XLS',
contents : null,
description: null
},
}
];

2
src/app/mock-api/apps/help-center/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const faqCategories = [
{
id : '28924eab-97cc-465a-ba21-f232bb95843f',

18
src/app/mock-api/apps/mailbox/api.ts
View File

@ -69,7 +69,7 @@ export class MailboxMockApi
this._folders.forEach((folder) => {
// Get the mails of this folder
const mails = this._mails.filter((mail) => mail.folder === folder.id);
const mails = this._mails.filter(mail => mail.folder === folder.id);
// If we are counting the 'sent' or the 'trash' folder...
if ( folder.slug === 'sent' || folder.slug === 'trash' )
@ -148,9 +148,7 @@ export class MailboxMockApi
do
{
sameSlug = this._labels.filter((item) => {
return item.slug === label.slug;
});
sameSlug = this._labels.filter(item => item.slug === label.slug);
if ( sameSlug.length > 0 )
{
@ -215,13 +213,11 @@ export class MailboxMockApi
const id = request.params.get('id');
// Find the label and delete it
const index = this._labels.findIndex((item) => item.id === id);
const index = this._labels.findIndex(item => item.id === id);
this._labels.splice(index, 1);
// Get all the mails that have the label
const mailsWithLabel = this._mails.filter((mail) => {
return mail.labels.indexOf(id) > -1;
});
const mailsWithLabel = this._mails.filter(mail => mail.labels.indexOf(id) > -1);
// Iterate through them and remove the label
mailsWithLabel.forEach((mail) => {
@ -267,9 +263,7 @@ export class MailboxMockApi
});
// Sort by date - descending
mails.sort((a, b) => {
return new Date(b.date).getTime() - new Date(a.date).getTime();
});
mails.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime());
// Figure out the cc and bcc counts
mails.forEach((mail) => {
@ -343,7 +337,7 @@ export class MailboxMockApi
const mails = cloneDeep(this._mails);
// Find the mail
const mail = mails.find((item) => item.id === id);
const mail = mails.find(item => item.id === id);
return [
200,

2
src/app/mock-api/apps/mailbox/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */
import * as moment from 'moment';
/* tslint:disable:max-line-length */
export const folders = [
{
id : '7c004a19-4506-48ef-93ab-f16381302e3b',

21
src/app/mock-api/apps/notes/api.ts
View File

@ -35,13 +35,10 @@ export class NotesMockApi
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onGet('api/apps/notes/labels')
.reply(() => {
return [
200,
cloneDeep(this._labels)
];
});
.reply(() => [
200,
cloneDeep(this._labels)
]);
// -----------------------------------------------------------------------------------------------------
// @ Labels - POST
@ -105,12 +102,12 @@ export class NotesMockApi
const id = request.params.get('id');
// Delete the label
this._labels = this._labels.filter((label) => label.id !== id);
this._labels = this._labels.filter(label => label.id !== id);
// Go through notes and delete the label
this._notes = this._notes.map((note) => ({
this._notes = this._notes.map(note => ({
...note,
labels: note.labels.filter((item) => item !== id)
labels: note.labels.filter(item => item !== id)
}));
return [
@ -175,10 +172,10 @@ export class NotesMockApi
let notes = cloneDeep(this._notes);
// Attach the labels to the notes
notes = notes.map((note) => (
notes = notes.map(note => (
{
...note,
labels: note.labels.map((labelId) => labels.find((label) => label.id === labelId))
labels: note.labels.map(labelId => labels.find(label => label.id === labelId))
}
));

2
src/app/mock-api/apps/notes/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
import moment from 'moment';
export const labels = [

22
src/app/mock-api/apps/tasks/api.ts
View File

@ -35,13 +35,10 @@ export class TasksMockApi
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onGet('api/apps/tasks/tags')
.reply(() => {
return [
200,
cloneDeep(this._tags)
];
});
.reply(() => [
200,
cloneDeep(this._tags)
]);
// -----------------------------------------------------------------------------------------------------
// @ Tags - POST
@ -109,7 +106,7 @@ export class TasksMockApi
const id = request.params.get('id');
// Find the tag and delete it
const index = this._tags.findIndex((item) => item.id === id);
const index = this._tags.findIndex(item => item.id === id);
this._tags.splice(index, 1);
// Get the tasks that have the tag
@ -165,9 +162,8 @@ export class TasksMockApi
let tasks = cloneDeep(this._tasks);
// Filter the tasks
tasks = tasks.filter((task) => {
return task.title && task.title.toLowerCase().includes(query.toLowerCase()) || task.notes && task.notes.toLowerCase().includes(query.toLowerCase());
});
tasks = tasks.filter(task => task.title && task.title.toLowerCase().includes(query.toLowerCase()) || task.notes && task.notes.toLowerCase()
.includes(query.toLowerCase()));
// Mark the found chars
tasks.forEach((task) => {
@ -231,7 +227,7 @@ export class TasksMockApi
const tasks = cloneDeep(this._tasks);
// Find the task
const task = tasks.find((item) => item.id === id);
const task = tasks.find(item => item.id === id);
return [
200,
@ -317,7 +313,7 @@ export class TasksMockApi
const id = request.params.get('id');
// Find the task and delete it
const index = this._tasks.findIndex((item) => item.id === id);
const index = this._tasks.findIndex(item => item.id === id);
this._tasks.splice(index, 1);
return [

2
src/app/mock-api/apps/tasks/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const tags = [
{
id : 'a0bf42ca-c3a5-47be-8341-b9c0bb8ef270',

48
src/app/mock-api/common/auth/api.ts
View File

@ -40,28 +40,24 @@ export class AuthMockApi
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onPost('api/auth/forgot-password', 1000)
.reply(() => {
// Simply return true
return [
.reply(() =>
[
200,
true
];
});
]
);
// -----------------------------------------------------------------------------------------------------
// @ Reset password - POST
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onPost('api/auth/reset-password', 1000)
.reply(() => {
// Simply return true
return [
.reply(() =>
[
200,
true
];
});
]
);
// -----------------------------------------------------------------------------------------------------
// @ Sign in - POST
@ -76,9 +72,9 @@ export class AuthMockApi
return [
200,
{
user : cloneDeep(this._user),
access_token: this._generateJWTToken(),
token_type : 'bearer'
user : cloneDeep(this._user),
accessToken: this._generateJWTToken(),
tokenType : 'bearer'
}
];
}
@ -98,7 +94,7 @@ export class AuthMockApi
.reply(({request}) => {
// Get the access token
const accessToken = request.body.access_token;
const accessToken = request.body.accessToken;
// Verify the token
if ( this._verifyJWTToken(accessToken) )
@ -106,9 +102,9 @@ export class AuthMockApi
return [
200,
{
user : cloneDeep(this._user),
access_token: this._generateJWTToken(),
token_type : 'bearer'
user : cloneDeep(this._user),
accessToken: this._generateJWTToken(),
tokenType : 'bearer'
}
];
}
@ -127,14 +123,14 @@ export class AuthMockApi
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onPost('api/auth/sign-up', 1500)
.reply(() => {
.reply(() =>
// Simply return true
return [
[
200,
true
];
});
]
);
// -----------------------------------------------------------------------------------------------------
// @ Unlock session - POST
@ -149,9 +145,9 @@ export class AuthMockApi
return [
200,
{
user : cloneDeep(this._user),
access_token: this._generateJWTToken(),
token_type : 'bearer'
user : cloneDeep(this._user),
accessToken: this._generateJWTToken(),
tokenType : 'bearer'
}
];
}

2
src/app/mock-api/common/messages/data.ts
View File

@ -1,7 +1,7 @@
/* eslint-disable */
import * as moment from 'moment';
import { Message } from 'app/layout/common/messages/messages.types';
/* tslint:disable:max-line-length */
export const messages: Message[] = [
{
id : '832276cc-c5e9-4fcc-8e23-d38e2e267bc9',

2
src/app/mock-api/common/navigation/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
import { FuseNavigationItem } from '@fuse/components/navigation';
export const defaultNavigation: FuseNavigationItem[] = [

2
src/app/mock-api/common/notifications/data.ts
View File

@ -1,7 +1,7 @@
/* eslint-disable */
import * as moment from 'moment';
import { Notification } from 'app/layout/common/notifications/notifications.types';
/* tslint:disable:max-line-length */
export const notifications: Notification[] = [
{
id : '493190c9-5b61-4912-afe5-78c21f1044d7',

8
src/app/mock-api/common/search/api.ts
View File

@ -55,14 +55,10 @@ export class SearchMockApi
}
// Filter the navigation
const navigationResults = cloneDeep(flatNavigation).filter((item) => {
return (item.title?.toLowerCase().includes(query) || (item.subtitle && item.subtitle.includes(query)));
});
const navigationResults = cloneDeep(flatNavigation).filter(item => (item.title?.toLowerCase().includes(query) || (item.subtitle && item.subtitle.includes(query))));
// Filter the contacts
const contactsResults = cloneDeep(this._contacts).filter((user) => {
return user.name.toLowerCase().includes(query);
});
const contactsResults = cloneDeep(this._contacts).filter(user => user.name.toLowerCase().includes(query));
// Create the results array
const results = [];

2
src/app/mock-api/common/shortcuts/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */
import { Shortcut } from 'app/layout/common/shortcuts/shortcuts.types';
/* tslint:disable:max-line-length */
export const shortcuts: Shortcut[] = [
{
id : 'a1ae91d3-e2cb-459b-9be9-a184694f548b',

2
src/app/mock-api/common/user/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
export const user: any = {
id : 'cfaad35d-07a3-4447-a6c3-d8c3d54fd5df',
name : 'Brian Hughes',

2
src/app/mock-api/dashboards/analytics/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */
import * as moment from 'moment';
/* tslint:disable:max-line-length */
export const analytics = {
visitors : {
series: {

2
src/app/mock-api/dashboards/project/data.ts
View File

@ -1,6 +1,6 @@
/* eslint-disable */
import * as moment from 'moment';
/* tslint:disable:max-line-length */
export const project = {
githubIssues : {
overview: {

2
src/app/mock-api/ui/icons/data.ts
View File

@ -1,4 +1,4 @@
/* tslint:disable:max-line-length */
/* eslint-disable */
// Updated at: 20210425 - 1792 icons
export const material = [

2
src/app/modules/admin/apps/academy/academy.module.ts
View File

@ -23,7 +23,7 @@ import { MatTabsModule } from '@angular/material/tabs';
AcademyDetailsComponent,
AcademyListComponent
],
imports: [
imports : [
RouterModule.forChild(academyRoutes),
MatButtonModule,
MatFormFieldModule,

3
src/app/modules/admin/apps/academy/details/details.component.html
View File

@ -48,7 +48,8 @@
<div class="py-2 px-8">
<ol>
<ng-container *ngFor="let step of course.steps; let last = last; trackBy: trackByFn">
<li class="relative group py-6"
<li
class="relative group py-6"
[class.current-step]="step.order === currentStep">
<ng-container *ngIf="!last">
<div

12
src/app/modules/admin/apps/academy/list/list.component.ts
View File

@ -81,23 +81,21 @@ export class AcademyListComponent implements OnInit, OnDestroy
// Filter by category
if ( categorySlug !== 'all' )
{
this.filteredCourses = this.filteredCourses.filter((course) => course.category === categorySlug);
this.filteredCourses = this.filteredCourses.filter(course => course.category === categorySlug);
}
// Filter by search query
if ( query !== '' )
{
this.filteredCourses = this.filteredCourses.filter((course) => {
return course.title.toLowerCase().includes(query.toLowerCase())
|| course.description.toLowerCase().includes(query.toLowerCase())
|| course.category.toLowerCase().includes(query.toLowerCase());
});
this.filteredCourses = this.filteredCourses.filter(course => course.title.toLowerCase().includes(query.toLowerCase())
|| course.description.toLowerCase().includes(query.toLowerCase())
|| course.category.toLowerCase().includes(query.toLowerCase()));
}
// Filter by completed
if ( hideCompleted )
{
this.filteredCourses = this.filteredCourses.filter((course) => course.progress.completed === 0);
this.filteredCourses = this.filteredCourses.filter(course => course.progress.completed === 0);
}
});
}

11
src/app/modules/admin/apps/calendar/calendar.component.ts
View File

@ -243,10 +243,8 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
day : 'numeric',
omitCommas: true
},
columnHeaderHtml : (date) => {
return `<span class="fc-weekday">${moment(date).format('ddd')}</span>
<span class="fc-date">${moment(date).format('D')}</span>`;
},
columnHeaderHtml : date => `<span class="fc-weekday">${moment(date).format('ddd')}</span>
<span class="fc-date">${moment(date).format('D')}</span>`,
slotDuration : '01:00:00',
slotLabelFormat : this.eventTimeFormat
},
@ -386,7 +384,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
return;
}
return this.calendars.find((calendar) => calendar.id === id);
return this.calendars.find(calendar => calendar.id === id);
}
/**
@ -552,7 +550,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
onEventRender(calendarEvent): void
{
// Get event's calendar
const calendar = this.calendars.find((item) => item.id === calendarEvent.event.extendedProps.calendarId);
const calendar = this.calendars.find(item => item.id === calendarEvent.event.extendedProps.calendarId);
// Return if the calendar doesn't exist...
if ( !calendar )
@ -779,6 +777,7 @@ export class CalendarComponent implements OnInit, AfterViewInit, OnDestroy
/**
* Create the event panel overlay
*
* @private
*/
private _createEventPanelOverlay(positionStrategy): void

4
src/app/modules/admin/apps/calendar/calendar.service.ts
View File

@ -13,7 +13,7 @@ export class CalendarService
// Private
private _calendars: BehaviorSubject<Calendar[] | null> = new BehaviorSubject(null);
private _events: BehaviorSubject<CalendarEvent[] | null> = new BehaviorSubject(null);
private _loadedEventsRange: { start: Moment | null, end: Moment | null } = {
private _loadedEventsRange: { start: Moment | null; end: Moment | null } = {
start: null,
end : null
};
@ -163,7 +163,7 @@ export class CalendarService
this._calendars.next(calendars);
// Remove the events belong to deleted calendar
const events = this._events.value.filter((event) => event.calendarId !== id);
const events = this._events.value.filter(event => event.calendarId !== id);
// Update the events
this._events.next(events);

2
src/app/modules/admin/apps/calendar/recurrence/recurrence.component.ts
View File

@ -212,7 +212,7 @@ export class CalendarRecurrenceComponent implements OnInit, OnDestroy
5: 'th'
};
this.nthWeekdayText = nthWeekday.slice(0, 1) + ordinalNumberSuffixes[nthWeekday.slice(0, 1)] + ' ' +
this.weekdays.find((item) => item.value === nthWeekday.slice(-2)).label;
this.weekdays.find(item => item.value === nthWeekday.slice(-2)).label;
// Set the defaults on recurrence form values
this.recurrenceFormValues = {

3
src/app/modules/admin/apps/calendar/sidebar/sidebar.component.ts
View File

@ -15,8 +15,8 @@ import { calendarColors } from 'app/modules/admin/apps/calendar/sidebar/calendar
})
export class CalendarSidebarComponent implements OnInit, OnDestroy
{
@ViewChild('editPanel') private _editPanel: TemplateRef<any>;
@Output() readonly calendarUpdated: EventEmitter<any> = new EventEmitter<any>();
@ViewChild('editPanel') private _editPanel: TemplateRef<any>;
calendar: Calendar | null;
calendarColors: any = calendarColors;
@ -194,6 +194,7 @@ export class CalendarSidebarComponent implements OnInit, OnDestroy
/**
* Create the edit panel overlay
*
* @private
*/
private _createEditPanelOverlay(): void

4
src/app/modules/admin/apps/chat/chat.module.ts
View File

@ -26,7 +26,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co
NewChatComponent,
ProfileComponent
],
imports: [
imports : [
RouterModule.forChild(chatRoutes),
MatButtonModule,
MatCheckboxModule,
@ -36,7 +36,7 @@ import { ProfileComponent } from 'app/modules/admin/apps/chat/profile/profile.co
MatMenuModule,
MatSidenavModule,
FuseAutogrowModule,
SharedModule,
SharedModule
]
})
export class ChatModule

8
src/app/modules/admin/apps/chat/chat.types.ts
View File

@ -20,7 +20,7 @@ export interface Contact
}[];
phoneNumbers?: {
country?: string;
number?: string;
phoneNumber?: string;
label?: string;
}[];
title?: string;
@ -29,9 +29,9 @@ export interface Contact
address?: string;
};
attachments?: {
media?: any[]
docs?: any[]
links?: any[]
media?: any[];
docs?: any[];
links?: any[];
};
}

2
src/app/modules/admin/apps/chat/chats/chats.component.ts
View File

@ -98,7 +98,7 @@ export class ChatsComponent implements OnInit, OnDestroy
return;
}
this.filteredChats = this.chats.filter((chat) => chat.contact.name.toLowerCase().includes(query.toLowerCase()));
this.filteredChats = this.chats.filter(chat => chat.contact.name.toLowerCase().includes(query.toLowerCase()));
}
/**

2
src/app/modules/admin/apps/chat/contact-info/contact-info.component.html
View File

@ -52,7 +52,7 @@
<ng-container *ngIf="chat.contact.details.phoneNumbers.length">
<div>
<div class="font-medium text-secondary">Phone number</div>
<div class="">{{chat.contact.details.phoneNumbers[0].number}}</div>
<div class="">{{chat.contact.details.phoneNumbers[0].phoneNumber}}</div>
</div>
</ng-container>
<ng-container *ngIf="chat.contact.details.title">

66
src/app/modules/admin/apps/chat/conversation/conversation.component.ts
View File

@ -31,6 +31,39 @@ export class ConversationComponent implements OnInit, OnDestroy
{
}
// -----------------------------------------------------------------------------------------------------
// @ Decorated methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resizeMessageInput(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this.messageInput.nativeElement.style.height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
@ -132,37 +165,4 @@ export class ConversationComponent implements OnInit, OnDestroy
{
return item.id || index;
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Resize on 'input' and 'ngModelChange' events
*
* @private
*/
@HostListener('input')
@HostListener('ngModelChange')
private _resizeMessageInput(): void
{
// This doesn't need to trigger Angular's change detection by itself
this._ngZone.runOutsideAngular(() => {
setTimeout(() => {
// Set the height to 'auto' so we can correctly read the scrollHeight
this.messageInput.nativeElement.style.height = 'auto';
// Detect the changes so the height is applied
this._changeDetectorRef.detectChanges();
// Get the scrollHeight and subtract the vertical padding
this.messageInput.nativeElement.style.height = `${this.messageInput.nativeElement.scrollHeight}px`;
// Detect the changes one more time to apply the final height
this._changeDetectorRef.detectChanges();
});
});
}
}

6
src/app/modules/admin/apps/chat/new-chat/new-chat.component.ts
View File

@ -6,9 +6,9 @@ import { Contact } from 'app/modules/admin/apps/chat/chat.types';
import { ChatService } from 'app/modules/admin/apps/chat/chat.service';
@Component({
selector : 'chat-new-chat',
templateUrl : './new-chat.component.html',
encapsulation: ViewEncapsulation.None,
selector : 'chat-new-chat',
templateUrl : './new-chat.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class NewChatComponent implements OnInit, OnDestroy

6
src/app/modules/admin/apps/chat/profile/profile.component.ts
View File

@ -6,9 +6,9 @@ import { Profile } from 'app/modules/admin/apps/chat/chat.types';
import { ChatService } from 'app/modules/admin/apps/chat/chat.service';
@Component({
selector : 'chat-profile',
templateUrl : './profile.component.html',
encapsulation: ViewEncapsulation.None,
selector : 'chat-profile',
templateUrl : './profile.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ProfileComponent implements OnInit, OnDestroy

4
src/app/modules/admin/apps/contacts/contacts.guards.ts
View File

@ -41,9 +41,7 @@ export class CanDeactivateContactsDetails implements CanDeactivate<ContactsDetai
else
{
// Close the drawer first, and then navigate
return component.closeDrawer().then(() => {
return true;
});
return component.closeDrawer().then(() => true);
}
}
}

3
src/app/modules/admin/apps/contacts/contacts.service.ts
View File

@ -127,7 +127,7 @@ export class ContactsService
{
return this.contacts$.pipe(
take(1),
switchMap((contacts) => this._httpClient.post<Contact>('api/apps/contacts/contact', {}).pipe(
switchMap(contacts => this._httpClient.post<Contact>('api/apps/contacts/contact', {}).pipe(
map((newContact) => {
// Update the contacts with the new contact
@ -354,6 +354,7 @@ export class ContactsService
avatar
}, {
headers: {
// eslint-disable-next-line @typescript-eslint/naming-convention
'Content-Type': avatar.type
}
}).pipe(

8
src/app/modules/admin/apps/contacts/contacts.types.ts
View File

@ -5,13 +5,13 @@ export interface Contact
background?: string | null;
name: string;
emails?: {
email: string,
label: string
email: string;
label: string;
}[];
phoneNumbers?: {
country: string;
number: string;
label: string
phoneNumber: string;
label: string;
}[];
title?: string;
company?: string;

4
src/app/modules/admin/apps/contacts/details/details.component.html
View File

@ -126,7 +126,7 @@
[style.backgroundSize]="'24px 3876px'"
[style.backgroundPosition]="getCountryByIso(phoneNumber.country).flagImagePos"></div>
<div class="sm:ml-3 font-mono">{{getCountryByIso(phoneNumber.country).code}}</div>
<div class="ml-2.5 font-mono">{{phoneNumber.number}}</div>
<div class="ml-2.5 font-mono">{{phoneNumber.phoneNumber}}</div>
<div
class="text-md truncate text-secondary"
*ngIf="phoneNumber.label">
@ -481,7 +481,7 @@
<mat-label *ngIf="first">Phone</mat-label>
<input
matInput
[formControl]="phoneNumber.get('number')"
[formControl]="phoneNumber.get('phoneNumber')"
[placeholder]="'Phone'">
<mat-select
class="mr-1.5"

30
src/app/modules/admin/apps/contacts/details/details.component.ts
View File

@ -149,9 +149,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// Create an email form group
phoneNumbersFormGroups.push(
this._formBuilder.group({
country: [phoneNumber.country],
number : [phoneNumber.number],
label : [phoneNumber.label]
country : [phoneNumber.country],
phoneNumber: [phoneNumber.phoneNumber],
label : [phoneNumber.label]
})
);
});
@ -161,9 +161,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// Create a phone number form group
phoneNumbersFormGroups.push(
this._formBuilder.group({
country: ['us'],
number : [''],
label : ['']
country : ['us'],
phoneNumber: [''],
label : ['']
})
);
}
@ -259,13 +259,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
const contact = this.contactForm.getRawValue();
// Go through the contact object and clear empty values
contact.emails = contact.emails.filter((email) => {
return email.email;
});
contact.emails = contact.emails.filter(email => email.email);
contact.phoneNumbers = contact.phoneNumbers.filter((phoneNumber) => {
return phoneNumber.number;
});
contact.phoneNumbers = contact.phoneNumbers.filter(phoneNumber => phoneNumber.phoneNumber);
// Update the contact on the server
this._contactsService.updateContact(contact.id, contact).subscribe(() => {
@ -480,7 +476,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
// If there is a tag...
const tag = this.filteredTags[0];
const isTagApplied = this.contact.tags.find((id) => id === tag.id);
const isTagApplied = this.contact.tags.find(id => id === tag.id);
// If the found tag is already applied to the contact...
if ( isTagApplied )
@ -652,9 +648,9 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
{
// Create an empty phone number form group
const phoneNumberFormGroup = this._formBuilder.group({
country: ['us'],
number : [''],
label : ['']
country : ['us'],
phoneNumber: [''],
label : ['']
});
// Add the phone number form group to the phoneNumbers form array
@ -688,7 +684,7 @@ export class ContactsDetailsComponent implements OnInit, OnDestroy
*/
getCountryByIso(iso: string): Country
{
return this.countries.find((country) => country.iso === iso);
return this.countries.find(country => country.iso === iso);
}
/**

14
src/app/modules/admin/apps/contacts/list/list.component.ts
View File

@ -93,11 +93,11 @@ export class ContactsListComponent implements OnInit, OnDestroy
this.searchInputControl.valueChanges
.pipe(
takeUntil(this._unsubscribeAll),
switchMap((query) => {
switchMap(query =>
// Search
return this._contactsService.searchContacts(query);
})
this._contactsService.searchContacts(query)
)
)
.subscribe();
@ -136,10 +136,10 @@ export class ContactsListComponent implements OnInit, OnDestroy
fromEvent(this._document, 'keydown')
.pipe(
takeUntil(this._unsubscribeAll),
filter<KeyboardEvent>((event) => {
return (event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/'); // '/'
})
filter<KeyboardEvent>(event =>
(event.ctrlKey === true || event.metaKey) // Ctrl or Cmd
&& (event.key === '/') // '/'
)
)
.subscribe(() => {
this.createContact();

2
src/app/modules/admin/apps/ecommerce/inventory/inventory.resolvers.ts
View File

@ -131,7 +131,7 @@ export class InventoryProductsResolver implements Resolve<any>
* @param route
* @param state
*/
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }>
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }>
{
return this._inventoryService.getProducts();
}

6
src/app/modules/admin/apps/ecommerce/inventory/inventory.service.ts
View File

@ -124,9 +124,9 @@ export class InventoryService
* @param search
*/
getProducts(page: number = 0, size: number = 10, sort: string = 'name', order: 'asc' | 'desc' | '' = 'asc', search: string = ''):
Observable<{ pagination: InventoryPagination, products: InventoryProduct[] }>
Observable<{ pagination: InventoryPagination; products: InventoryProduct[] }>
{
return this._httpClient.get<{ pagination: InventoryPagination, products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', {
return this._httpClient.get<{ pagination: InventoryPagination; products: InventoryProduct[] }>('api/apps/ecommerce/inventory/products', {
params: {
page: '' + page,
size: '' + size,
@ -179,7 +179,7 @@ export class InventoryService
{
return this.products$.pipe(
take(1),
switchMap((products) => this._httpClient.post<InventoryProduct>('api/apps/ecommerce/inventory/product', {}).pipe(
switchMap(products => this._httpClient.post<InventoryProduct>('api/apps/ecommerce/inventory/product', {}).pipe(
map((newProduct) => {
// Update the products with the new product

6
src/app/modules/admin/apps/ecommerce/inventory/list/inventory.component.ts
View File

@ -5,7 +5,7 @@ import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { merge, Observable, Subject } from 'rxjs';
import { debounceTime, map, switchMap, takeUntil } from 'rxjs/operators';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { InventoryBrand, InventoryCategory, InventoryPagination, InventoryProduct, InventoryTag, InventoryVendor } from 'app/modules/admin/apps/ecommerce/inventory/inventory.types';
import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inventory.service';
@ -14,7 +14,7 @@ import { InventoryService } from 'app/modules/admin/apps/ecommerce/inventory/inv
templateUrl : './inventory.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush,
animations : FuseAnimations
animations : fuseAnimations
})
export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy
{
@ -333,7 +333,7 @@ export class InventoryListComponent implements OnInit, AfterViewInit, OnDestroy
// If there is a tag...
const tag = this.filteredTags[0];
const isTagApplied = this.selectedProduct.tags.find((id) => id === tag.id);
const isTagApplied = this.selectedProduct.tags.find(id => id === tag.id);
// If the found tag is already applied to the contact...
if ( isTagApplied )

4
src/app/modules/admin/apps/file-manager/file-manager.guards.ts
View File

@ -41,9 +41,7 @@ export class CanDeactivateFileManagerDetails implements CanDeactivate<FileManage
else
{
// Close the drawer first, and then navigate
return component.closeDrawer().then(() => {
return true;
});
return component.closeDrawer().then(() => true);
}
}
}

4
src/app/modules/admin/apps/help-center/support/support.component.ts
View File

@ -1,13 +1,13 @@
import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms';
import { FuseAnimations } from '@fuse/animations';
import { fuseAnimations } from '@fuse/animations';
import { HelpCenterService } from 'app/modules/admin/apps/help-center/help-center.service';
@Component({
selector : 'help-center-support',
templateUrl : './support.component.html',
encapsulation: ViewEncapsulation.None,
animations : FuseAnimations
animations : fuseAnimations
})
export class HelpCenterSupportComponent implements OnInit
{

2
src/app/modules/admin/apps/mailbox/compose/compose.component.ts
View File

@ -10,7 +10,7 @@ import { MatDialogRef } from '@angular/material/dialog';
export class MailboxComposeComponent implements OnInit
{
composeForm: FormGroup;
copyFields: { cc: boolean, bcc: boolean } = {
copyFields: { cc: boolean; bcc: boolean } = {
cc : false,
bcc: false
};

4
src/app/modules/admin/apps/mailbox/details/details.component.ts
View File

@ -114,9 +114,7 @@ export class MailboxDetailsComponent implements OnInit, OnDestroy
moveToFolder(folderSlug: string): void
{
// Find the folder details
const folder = this.folders.find((item) => {
return item.slug === folderSlug;
});
const folder = this.folders.find(item => item.slug === folderSlug);
// Return if the current folder of the mail
// is already equals to the given folder

12
src/app/modules/admin/apps/mailbox/mailbox.routing.ts
View File

@ -11,8 +11,8 @@ import { MailboxSettingsComponent } from 'app/modules/admin/apps/mailbox/setting
*
* @param url
*/
export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult
{
export const mailboxRouteMatcher: (url: UrlSegment[]) => UrlMatchResult = (url: UrlSegment[]) => {
// Prepare consumed url and positional parameters
let consumed = url;
const posParams = {};
@ -52,10 +52,10 @@ export function mailboxRouteMatcher(url: UrlSegment[]): UrlMatchResult
consumed,
posParams
};
}
};
export const mailboxRunGuardsAndResolvers: (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => boolean = (from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot) => {
export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot): boolean
{
// If we are navigating from mail to mails, meaning there is an id in
// from's deepest first child and there isn't one in the to's, we will
// trigger the resolver
@ -99,7 +99,7 @@ export function mailboxRunGuardsAndResolvers(from: ActivatedRouteSnapshot, to: A
// Trigger the resolver on other cases
return true;
}
};
export const mailboxRoutes: Route[] = [
{

2
src/app/modules/admin/apps/mailbox/settings/settings.component.ts
View File

@ -117,7 +117,7 @@ export class MailboxSettingsComponent implements OnInit
const labelsFormArray = this.labelsForm.get('labels') as FormArray;
// Remove the label from the labels form array
labelsFormArray.removeAt(labelsFormArray.value.findIndex((label) => label.id === id));
labelsFormArray.removeAt(labelsFormArray.value.findIndex(label => label.id === id));
// Delete label on the server
this._mailboxService.deleteLabel(id).subscribe();

4
src/app/modules/admin/apps/mailbox/sidebar/sidebar.component.ts
View File

@ -106,7 +106,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy
const dialogRef = this._matDialog.open(MailboxComposeComponent);
dialogRef.afterClosed()
.subscribe(result => {
.subscribe((result) => {
console.log('Compose dialog was closed!');
});
}
@ -276,7 +276,7 @@ export class MailboxSidebarComponent implements OnInit, OnDestroy
private _updateNavigationBadge(folders: MailFolder[]): void
{
// Get the inbox folder
const inboxFolder = this.folders.find((folder) => folder.slug === 'inbox');
const inboxFolder = this.folders.find(folder => folder.slug === 'inbox');
// Get the component -> navigation mock-api -> item
const mainNavigationComponent = this._fuseNavigationService.getComponent('mainNavigation');

8
src/app/modules/admin/apps/notes/details/details.component.ts
View File

@ -77,7 +77,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
.pipe(
takeUntil(this._unsubscribeAll),
debounceTime(500),
switchMap((note) => this._notesService.updateNote(note)))
switchMap(note => this._notesService.updateNote(note)))
.subscribe(() => {
// Mark for check
@ -198,7 +198,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
removeTaskFromNote(note: Note, task: Task): void
{
// Remove the task
note.tasks = note.tasks.filter((item) => item.id !== task.id);
note.tasks = note.tasks.filter(item => item.id !== task.id);
// Update the note
this.noteChanged.next(note);
@ -228,7 +228,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
*/
isNoteHasLabel(note: Note, label: Label): boolean
{
return !!note.labels.find((item) => item.id === label.id);
return !!note.labels.find(item => item.id === label.id);
}
/**
@ -242,7 +242,7 @@ export class NotesDetailsComponent implements OnInit, OnDestroy
// If the note already has the label
if ( this.isNoteHasLabel(note, label) )
{
note.labels = note.labels.filter((item) => item.id !== label.id);
note.labels = note.labels.filter(item => item.id !== label.id);
}
// Otherwise
else

Some files were not shown because too many files have changed in this diff Show More