Compare commits

..

23 Commits

Author SHA1 Message Date
sercan
67d25012ec Increased the version number & updated the changelog 2021-08-12 17:04:57 +03:00
sercan
6de6a07778 Decreased budget sizes since new Fuse is a lot smaller compared to the one with the old design 2021-08-12 13:57:29 +03:00
sercan
e7ab0ea13f (apps/mailbox) Fixed: Compose dialog doesn't work correctly on small height resolutions
(apps/mailbox) Style improvements
2021-08-12 13:45:34 +03:00
sercan
4b686d86cc (@fuse/overrides) Fixed: Quill editor is not styled correctly by default 2021-08-12 13:42:59 +03:00
sercan
190395f14b (@fuse/theming) Better structuring on the themes.scss file
(@fuse) Disabled Angular Material 'theme' sanity check since we use 'all-component-themes' without a color map
2021-08-12 13:17:53 +03:00
sercan
4a9b8ee91e (dependencies) Updated Angular, Angular Material and various other dependencies 2021-08-12 11:32:04 +03:00
sercan
488fe8a1eb (ui/page-layouts) Fixed: Demo layout navigation appearance is not correct 2021-08-11 22:25:49 +03:00
sercan
db9a2a2433 (dependencies) Updated Angular, Angular Material and various other dependencies 2021-08-11 22:25:15 +03:00
sercan
3dda8479cf (tailwindcss) Removed old jsdoc from the config file 2021-08-08 22:27:24 +03:00
sercan
7c402670a1 (docs/confirmation) Updated the docs of the confirmation dialog 2021-08-04 10:10:07 +03:00
sercan
f6bf0fb5d3 (fuse/confirmation) Fixed: Dialog size cannot be updated using dialogRef's "updateSize" method 2021-08-04 09:54:35 +03:00
sercan
d44c004d01 Removed empty "styles" from component decorators 2021-08-04 09:46:36 +03:00
sercan
4ec40271c5 Updated the package.json version number 2021-07-29 10:39:16 +03:00
sercan
b21cdf1655 Updated the changelog and increased the version number 2021-07-29 10:19:28 +03:00
sercan
6fff259fe3 (dependencies) Updated Angular, Angular Material and various other dependencies 2021-07-29 10:15:13 +03:00
sercan
8fcb0aea03 (docs) Updated the multi language guide 2021-07-29 10:14:52 +03:00
sercan
2c90770d9b (index) Updated the title, description and keywords 2021-07-23 22:29:45 +03:00
sercan
1581ea74cc (dashboards/finance) Added finance dashboard
(dashboards/crypto) Added crypto dashboard
2021-07-23 22:23:42 +03:00
sercan
569809aabb (dashboards/project) Small tweaks 2021-07-23 22:23:02 +03:00
sercan
dde9333120 (dashboards/project) Small tweaks on the header 2021-07-23 21:30:51 +03:00
sercan
10ec1790ca (dashboards/project) Module import order 2021-07-21 12:22:23 +03:00
sercan
a2ff55d4c1 (dashboards/project) Light header on light themes, small adjustments in the project selector 2021-07-21 12:22:02 +03:00
sercan
966e2db743 (apps/contacts) Small adjustments for better consistency
(apps/ecommerce/inventory) Small adjustments for better consistency
2021-07-21 11:36:43 +03:00
89 changed files with 5026 additions and 1232 deletions

View File

@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
## Build
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
## Running unit tests
@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
## Running end-to-end tests
Run `ng e2e` to execute the end-to-end tests via a platform of your choice.
Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
## Further help

View File

@@ -60,13 +60,13 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "5mb",
"maximumError": "8mb"
"maximumWarning": "3mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "100kb",
"maximumError": "150kb"
"maximumWarning": "75kb",
"maximumError": "90kb"
}
],
"fileReplacements": [

1902
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "@fuse/demo",
"version": "13.3.1",
"version": "13.5.0",
"description": "Fuse - Angular Admin Template and Starter Project",
"author": "https://themeforest.net/user/srcn",
"license": "https://themeforest.net/licenses/standard",
@@ -9,21 +9,22 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"lint": "ng lint"
},
"dependencies": {
"@angular/animations": "12.1.2",
"@angular/cdk": "12.1.2",
"@angular/common": "12.1.2",
"@angular/compiler": "12.1.2",
"@angular/core": "12.1.2",
"@angular/forms": "12.1.2",
"@angular/material": "12.1.2",
"@angular/material-moment-adapter": "12.1.2",
"@angular/platform-browser": "12.1.2",
"@angular/platform-browser-dynamic": "12.1.2",
"@angular/router": "12.1.2",
"@angular/animations": "12.2.1",
"@angular/cdk": "12.2.1",
"@angular/common": "12.2.1",
"@angular/compiler": "12.2.1",
"@angular/core": "12.2.1",
"@angular/forms": "12.2.1",
"@angular/material": "12.2.1",
"@angular/material-moment-adapter": "12.2.1",
"@angular/platform-browser": "12.2.1",
"@angular/platform-browser-dynamic": "12.2.1",
"@angular/router": "12.2.1",
"@fullcalendar/angular": "4.4.5-beta",
"@fullcalendar/core": "4.4.2",
"@fullcalendar/daygrid": "4.4.2",
@@ -33,48 +34,48 @@
"@fullcalendar/rrule": "4.4.2",
"@fullcalendar/timegrid": "4.4.2",
"@ngneat/transloco": "2.22.0",
"apexcharts": "3.27.2",
"apexcharts": "3.27.3",
"crypto-js": "3.3.0",
"highlight.js": "11.1.0",
"highlight.js": "11.2.0",
"lodash-es": "4.17.21",
"moment": "2.29.1",
"ng-apexcharts": "1.5.12",
"ngx-markdown": "12.0.1",
"ngx-quill": "14.1.2",
"perfect-scrollbar": "1.5.1",
"ngx-quill": "14.2.0",
"perfect-scrollbar": "1.5.2",
"quill": "1.3.7",
"rrule": "2.6.8",
"rxjs": "6.6.7",
"tslib": "2.3.0",
"tslib": "2.3.1",
"web-animations-js": "2.3.2",
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.1.2",
"@angular-devkit/build-angular": "12.2.1",
"@angular-eslint/builder": "12.3.1",
"@angular-eslint/eslint-plugin": "12.3.1",
"@angular-eslint/eslint-plugin-template": "12.3.1",
"@angular-eslint/schematics": "12.3.1",
"@angular-eslint/template-parser": "12.3.1",
"@angular/cli": "12.1.2",
"@angular/compiler-cli": "12.1.2",
"@angular/cli": "12.2.1",
"@angular/compiler-cli": "12.2.1",
"@tailwindcss/aspect-ratio": "0.2.1",
"@tailwindcss/line-clamp": "0.2.1",
"@tailwindcss/typography": "0.4.1",
"@types/chroma-js": "2.1.3",
"@types/crypto-js": "3.1.47",
"@types/highlight.js": "10.1.0",
"@types/jasmine": "3.8.1",
"@types/lodash": "4.14.171",
"@types/jasmine": "3.8.2",
"@types/lodash": "4.14.172",
"@types/lodash-es": "4.17.4",
"@types/node": "12.20.16",
"@typescript-eslint/eslint-plugin": "4.28.3",
"@typescript-eslint/parser": "4.28.3",
"@types/node": "12.20.19",
"@typescript-eslint/eslint-plugin": "4.29.1",
"@typescript-eslint/parser": "4.29.1",
"autoprefixer": "10.3.1",
"chroma-js": "2.1.2",
"eslint": "7.30.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-jsdoc": "35.4.3",
"eslint": "7.32.0",
"eslint-plugin-import": "2.24.0",
"eslint-plugin-jsdoc": "36.0.7",
"eslint-plugin-prefer-arrow": "1.2.3",
"jasmine-core": "3.8.0",
"karma": "6.3.4",
@@ -83,8 +84,8 @@
"karma-jasmine": "4.0.1",
"karma-jasmine-html-reporter": "1.7.0",
"lodash": "4.17.21",
"postcss": "8.3.5",
"tailwindcss": "2.2.4",
"postcss": "8.3.6",
"tailwindcss": "2.2.7",
"typescript": "4.3.5"
}
}

View File

@@ -10,7 +10,6 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
@Component({
selector : 'fuse-horizontal-navigation-basic-item',
templateUrl : './basic.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseHorizontalNavigationBasicItemComponent implements OnInit, OnDestroy

View File

@@ -10,7 +10,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-horizontal-navigation-branch-item',
templateUrl : './branch.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseHorizontalNavigationBranchItemComponent implements OnInit, OnDestroy

View File

@@ -8,7 +8,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-horizontal-navigation-divider-item',
templateUrl : './divider.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseHorizontalNavigationDividerItemComponent implements OnInit, OnDestroy

View File

@@ -8,7 +8,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-horizontal-navigation-spacer-item',
templateUrl : './spacer.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseHorizontalNavigationSpacerItemComponent implements OnInit, OnDestroy

View File

@@ -10,7 +10,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-vertical-navigation-aside-item',
templateUrl : './aside.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationAsideItemComponent implements OnChanges, OnInit, OnDestroy

View File

@@ -10,7 +10,6 @@ import { FuseUtilsService } from '@fuse/services/utils/utils.service';
@Component({
selector : 'fuse-vertical-navigation-basic-item',
templateUrl : './basic.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationBasicItemComponent implements OnInit, OnDestroy

View File

@@ -11,7 +11,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-vertical-navigation-collapsable-item',
templateUrl : './collapsable.component.html',
styles : [],
animations : fuseAnimations,
changeDetection: ChangeDetectionStrategy.OnPush
})

View File

@@ -8,7 +8,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-vertical-navigation-divider-item',
templateUrl : './divider.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationDividerItemComponent implements OnInit, OnDestroy

View File

@@ -9,7 +9,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-vertical-navigation-group-item',
templateUrl : './group.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationGroupItemComponent implements OnInit, OnDestroy

View File

@@ -8,7 +8,6 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
@Component({
selector : 'fuse-vertical-navigation-spacer-item',
templateUrl : './spacer.component.html',
styles : [],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FuseVerticalNavigationSpacerItemComponent implements OnInit, OnDestroy

View File

@@ -1,4 +1,5 @@
import { NgModule, Optional, SkipSelf } from '@angular/core';
import { MATERIAL_SANITY_CHECKS } from '@angular/material/core';
import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
import { FuseConfirmationModule } from '@fuse/services/confirmation';
import { FuseMediaWatcherModule } from '@fuse/services/media-watcher/media-watcher.module';
@@ -15,6 +16,15 @@ import { FuseUtilsModule } from '@fuse/services/utils/utils.module';
FuseUtilsModule
],
providers: [
{
// Disable 'theme' sanity check
provide : MATERIAL_SANITY_CHECKS,
useValue: {
doctype: true,
theme : false,
version: true
}
},
{
// Use the 'fill' appearance on Angular Material form fields by default
provide : MAT_FORM_FIELD_DEFAULT_OPTIONS,

View File

@@ -51,7 +51,8 @@ export class FuseConfirmationService
return this._matDialog.open(FuseConfirmationDialogComponent, {
autoFocus : false,
disableClose: !userConfig.dismissible,
data : userConfig
data : userConfig,
panelClass : 'fuse-confirmation-dialog-panel'
});
}
}

View File

@@ -1,4 +1,4 @@
<div class="relative flex flex-col md:w-128 -m-6">
<div class="relative flex flex-col w-full h-full">
<!-- Dismiss button -->
<ng-container *ngIf="data.dismissible">
@@ -14,7 +14,7 @@
</ng-container>
<!-- Content -->
<div class="flex flex-col sm:flex-row items-center sm:items-start p-8 pb-6 sm:pb-8">
<div class="flex flex-col sm:flex-row flex-auto items-center sm:items-start p-8 pb-6 sm:pb-8">
<!-- Icon -->
<ng-container *ngIf="data.icon.show">

View File

@@ -5,6 +5,20 @@ import { FuseConfirmationConfig } from '@fuse/services/confirmation/confirmation
@Component({
selector : 'fuse-confirmation-dialog',
templateUrl : './dialog.component.html',
styles : [
/* language=SCSS */
`
.fuse-confirmation-dialog-panel {
@screen md {
@apply w-128;
}
.mat-dialog-container {
padding: 0 !important;
}
}
`
],
encapsulation: ViewEncapsulation.None
})
export class FuseConfirmationDialogComponent implements OnInit

View File

@@ -4,11 +4,12 @@
.ql-toolbar {
border-radius: 6px 6px 0 0;
padding: 0 !important;
@apply bg-gray-100 border-gray-300;
@apply bg-gray-100;
@apply border-gray-300 border-opacity-100 #{'!important'};
.dark & {
background-color: rgba(0, 0, 0, 0.05);
@apply border-gray-500;
@apply border-gray-500 #{'!important'};
}
.ql-formats {
@@ -81,26 +82,22 @@
.ql-container {
overflow: hidden;
border-radius: 0 0 6px 6px;
@apply border-gray-300 shadow-sm;
@apply border-gray-300 border-opacity-100 shadow-sm #{'!important'};
.dark & {
@apply border-gray-500;
@apply border-gray-500 #{'!important'};
}
.ql-editor {
min-height: 160px;
max-height: 160px;
height: 160px;
@apply bg-gray-50;
@apply bg-card;
.dark & {
background-color: rgba(0, 0, 0, 0.05);
}
&:focus {
@apply bg-card;
}
&.ql-blank::before {
@apply text-hint;
}

View File

@@ -18,81 +18,6 @@
)
));
/* Prepare the Background and Foreground maps */
$background-light: (
status-bar: #CBD5E1, /* blueGray.300 */
app-bar: #FFFFFF,
background: #F1F5F9, /* blueGray.100 */
hover: rgba(148, 163, 184, 0.12), /* blueGray.400 + opacity */
card: #FFFFFF,
dialog: #FFFFFF,
disabled-button: rgba(148, 163, 184, 0.38), /* blueGray.400 + opacity */
raised-button: #FFFFFF,
focused-button: #64748B, /* blueGray.500 */
selected-button: #E2E8F0, /* blueGray.200 */
selected-disabled-button: #E2E8F0, /* blueGray.200 */
disabled-button-toggle: #CBD5E1, /* blueGray.300 */
unselected-chip: #E2E8F0, /* blueGray.200 */
disabled-list-option: #CBD5E1, /* blueGray.300 */
tooltip: #1E293B /* blueGray.800 */
);
$background-dark: (
status-bar: #0F172A, /* blueGray.900 */
app-bar: #0F172A, /* blueGray.900 */
background: #0F172A, /* blueGray.900 */
hover: rgba(255, 255, 255, 0.05),
card: #1E293B, /* blueGray.800 */
dialog: #1E293B, /* blueGray.800 */
disabled-button: rgba(15, 23, 42, 0.38), /* blueGray.900 + opacity */
raised-button: #0F172A, /* blueGray.900 */
focused-button: #E2E8F0, /* blueGray.200 */
selected-button: rgba(255, 255, 255, 0.05),
selected-disabled-button: #1E293B, /* blueGray.800 */
disabled-button-toggle: #0F172A, /* blueGray.900 */
unselected-chip: #475569, /* blueGray.600 */
disabled-list-option: #E2E8F0, /* blueGray.200 */
tooltip: #64748B /* blueGray.500 */
);
$foreground-light: (
base: #000000,
divider: #E2E8F0, /* blueGray.200 */
dividers: #E2E8F0, /* blueGray.200 */
disabled: #94A3B8, /* blueGray.400 */
disabled-button: #94A3B8, /* blueGray.400 */
disabled-text: #94A3B8, /* blueGray.400 */
elevation: #000000,
hint-text: #94A3B8, /* blueGray.400 */
secondary-text: #64748B, /* blueGray.500 */
icon: #64748B, /* blueGray.500 */
icons: #64748B, /* blueGray.500 */
mat-icon: #64748B, /* blueGray.500 */
text: #1E293B, /* blueGray.800 */
slider-min: #1E293B, /* blueGray.800 */
slider-off: #CBD5E1, /* blueGray.300 */
slider-off-active: #94A3B8 /* blueGray.400 */
);
$foreground-dark: (
base: #FFFFFF,
divider: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
dividers: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
disabled: #475569, /* blueGray.600 */
disabled-button: #1E293B, /* blueGray.800 */
disabled-text: #475569, /* blueGray.600 */
elevation: #000000,
hint-text: #64748B, /* blueGray.500 */
secondary-text: #94A3B8, /* blueGray.400 */
icon: #F1F5F9, /* blueGray.100 */
icons: #F1F5F9, /* blueGray.100 */
mat-icon: #94A3B8, /* blueGray.400 */
text: #FFFFFF,
slider-min: #FFFFFF,
slider-off: #64748B, /* blueGray.500 */
slider-off-active: #94A3B8 /* blueGray.400 */
);
/* Generate Primary, Accent and Warn palettes */
$palettes: ();
@each $name in (primary, accent, warn) {
@@ -145,8 +70,41 @@ body .light {
accent: map.get(map.get($base-light-theme, color), accent),
warn: map.get(map.get($base-light-theme, color), warn),
is-dark: map.get(map.get($base-light-theme, color), is-dark),
foreground: $foreground-light,
background: $background-light
foreground: (
base: #000000,
divider: #E2E8F0, /* blueGray.200 */
dividers: #E2E8F0, /* blueGray.200 */
disabled: #94A3B8, /* blueGray.400 */
disabled-button: #94A3B8, /* blueGray.400 */
disabled-text: #94A3B8, /* blueGray.400 */
elevation: #000000,
hint-text: #94A3B8, /* blueGray.400 */
secondary-text: #64748B, /* blueGray.500 */
icon: #64748B, /* blueGray.500 */
icons: #64748B, /* blueGray.500 */
mat-icon: #64748B, /* blueGray.500 */
text: #1E293B, /* blueGray.800 */
slider-min: #1E293B, /* blueGray.800 */
slider-off: #CBD5E1, /* blueGray.300 */
slider-off-active: #94A3B8 /* blueGray.400 */
),
background: (
status-bar: #CBD5E1, /* blueGray.300 */
app-bar: #FFFFFF,
background: #F1F5F9, /* blueGray.100 */
hover: rgba(148, 163, 184, 0.12), /* blueGray.400 + opacity */
card: #FFFFFF,
dialog: #FFFFFF,
disabled-button: rgba(148, 163, 184, 0.38), /* blueGray.400 + opacity */
raised-button: #FFFFFF,
focused-button: #64748B, /* blueGray.500 */
selected-button: #E2E8F0, /* blueGray.200 */
selected-disabled-button: #E2E8F0, /* blueGray.200 */
disabled-button-toggle: #CBD5E1, /* blueGray.300 */
unselected-chip: #E2E8F0, /* blueGray.200 */
disabled-list-option: #CBD5E1, /* blueGray.300 */
tooltip: #1E293B /* blueGray.800 */
)
)
);
@@ -166,8 +124,41 @@ body .dark {
accent: map.get(map.get($base-dark-theme, color), accent),
warn: map.get(map.get($base-dark-theme, color), warn),
is-dark: map.get(map.get($base-dark-theme, color), is-dark),
foreground: $foreground-dark,
background: $background-dark
foreground: (
base: #FFFFFF,
divider: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
dividers: rgba(241, 245, 249, 0.12), /* blueGray.100 + opacity */
disabled: #475569, /* blueGray.600 */
disabled-button: #1E293B, /* blueGray.800 */
disabled-text: #475569, /* blueGray.600 */
elevation: #000000,
hint-text: #64748B, /* blueGray.500 */
secondary-text: #94A3B8, /* blueGray.400 */
icon: #F1F5F9, /* blueGray.100 */
icons: #F1F5F9, /* blueGray.100 */
mat-icon: #94A3B8, /* blueGray.400 */
text: #FFFFFF,
slider-min: #FFFFFF,
slider-off: #64748B, /* blueGray.500 */
slider-off-active: #94A3B8 /* blueGray.400 */
),
background: (
status-bar: #0F172A, /* blueGray.900 */
app-bar: #0F172A, /* blueGray.900 */
background: #0F172A, /* blueGray.900 */
hover: rgba(255, 255, 255, 0.05),
card: #1E293B, /* blueGray.800 */
dialog: #1E293B, /* blueGray.800 */
disabled-button: rgba(15, 23, 42, 0.38), /* blueGray.900 + opacity */
raised-button: #0F172A, /* blueGray.900 */
focused-button: #E2E8F0, /* blueGray.200 */
selected-button: rgba(255, 255, 255, 0.05),
selected-disabled-button: #1E293B, /* blueGray.800 */
disabled-button-toggle: #0F172A, /* blueGray.900 */
unselected-chip: #475569, /* blueGray.600 */
disabled-list-option: #E2E8F0, /* blueGray.200 */
tooltip: #64748B /* blueGray.500 */
)
)
);

View File

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

View File

@@ -79,6 +79,8 @@ export const appRoutes: Route[] = [
{path: 'dashboards', children: [
{path: 'project', loadChildren: () => import('app/modules/admin/dashboards/project/project.module').then(m => m.ProjectModule)},
{path: 'analytics', loadChildren: () => import('app/modules/admin/dashboards/analytics/analytics.module').then(m => m.AnalyticsModule)},
{path: 'finance', loadChildren: () => import('app/modules/admin/dashboards/finance/finance.module').then(m => m.FinanceModule)},
{path: 'crypto', loadChildren: () => import('app/modules/admin/dashboards/crypto/crypto.module').then(m => m.CryptoModule)},
]},
// Apps

View File

@@ -22,6 +22,20 @@ export const defaultNavigation: FuseNavigationItem[] = [
type : 'basic',
icon : 'heroicons_outline:chart-pie',
link : '/dashboards/analytics'
},
{
id : 'dashboards.finance',
title: 'Finance',
type : 'basic',
icon : 'heroicons_outline:cash',
link : '/dashboards/finance'
},
{
id : 'dashboards.crypto',
title: 'Crypto',
type : 'basic',
icon : 'heroicons_outline:currency-dollar',
link : '/dashboards/crypto'
}
]
},
@@ -967,7 +981,7 @@ export const defaultNavigation: FuseNavigationItem[] = [
icon : 'heroicons_outline:speakerphone',
link : '/docs/changelog',
badge: {
title : '13.3.1',
title : '13.5.0',
classes: 'px-2 bg-yellow-300 text-black rounded-full'
}
},

View File

@@ -0,0 +1,38 @@
import { Injectable } from '@angular/core';
import { cloneDeep } from 'lodash-es';
import { FuseMockApiService } from '@fuse/lib/mock-api';
import { crypto as cryptoData } from 'app/mock-api/dashboards/crypto/data';
@Injectable({
providedIn: 'root'
})
export class CryptoMockApi
{
private _crypto: any = cryptoData;
/**
* Constructor
*/
constructor(private _fuseMockApiService: FuseMockApiService)
{
// Register Mock API handlers
this.registerHandlers();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Register Mock API handlers
*/
registerHandlers(): void
{
// -----------------------------------------------------------------------------------------------------
// @ Crypto - GET
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onGet('api/dashboards/crypto')
.reply(() => [200, cloneDeep(this._crypto)]);
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,38 @@
import { Injectable } from '@angular/core';
import { cloneDeep } from 'lodash-es';
import { FuseMockApiService } from '@fuse/lib/mock-api';
import { finance as financeData } from 'app/mock-api/dashboards/finance/data';
@Injectable({
providedIn: 'root'
})
export class FinanceMockApi
{
private _finance: any = financeData;
/**
* Constructor
*/
constructor(private _fuseMockApiService: FuseMockApiService)
{
// Register Mock API handlers
this.registerHandlers();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Register Mock API handlers
*/
registerHandlers(): void
{
// -----------------------------------------------------------------------------------------------------
// @ Sales - GET
// -----------------------------------------------------------------------------------------------------
this._fuseMockApiService
.onGet('api/dashboards/finance')
.reply(() => [200, cloneDeep(this._finance)]);
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -5,8 +5,10 @@ import { AuthMockApi } from 'app/mock-api/common/auth/api';
import { CalendarMockApi } from 'app/mock-api/apps/calendar/api';
import { ChatMockApi } from 'app/mock-api/apps/chat/api';
import { ContactsMockApi } from 'app/mock-api/apps/contacts/api';
import { CryptoMockApi } from 'app/mock-api/dashboards/crypto/api';
import { ECommerceInventoryMockApi } from 'app/mock-api/apps/ecommerce/inventory/api';
import { FileManagerMockApi } from 'app/mock-api/apps/file-manager/api';
import { FinanceMockApi } from 'app/mock-api/dashboards/finance/api';
import { HelpCenterMockApi } from 'app/mock-api/apps/help-center/api';
import { IconsMockApi } from 'app/mock-api/ui/icons/api';
import { MailboxMockApi } from 'app/mock-api/apps/mailbox/api';
@@ -29,8 +31,10 @@ export const mockApiServices = [
CalendarMockApi,
ChatMockApi,
ContactsMockApi,
CryptoMockApi,
ECommerceInventoryMockApi,
FileManagerMockApi,
FinanceMockApi,
HelpCenterMockApi,
IconsMockApi,
MailboxMockApi,

View File

@@ -42,7 +42,7 @@
<div class="flex items-center mt-4 sm:mt-0 md:mt-4">
<!-- Search -->
<div class="flex-auto">
<mat-form-field class="fuse-mat-dense fuse-mat-no-subscript w-full min-w-50">
<mat-form-field class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded w-full min-w-50">
<mat-icon
class="icon-size-5"
matPrefix

View File

@@ -13,10 +13,11 @@
<!-- Actions -->
<div class="flex flex-shrink-0 items-center mt-6 sm:mt-0 sm:ml-4">
<!-- Search -->
<mat-form-field class="fuse-mat-dense fuse-mat-no-subscript min-w-50">
<mat-form-field class="fuse-mat-dense fuse-mat-no-subscript fuse-mat-rounded min-w-64">
<mat-icon
class="icon-size-5"
matPrefix
[svgIcon]="'heroicons_outline:search'"></mat-icon>
[svgIcon]="'heroicons_solid:search'"></mat-icon>
<input
matInput
[formControl]="searchInputControl"

View File

@@ -1,4 +1,4 @@
<div class="flex flex-col max-w-240 md:min-w-160 -m-6">
<div class="flex flex-col max-w-240 md:min-w-160 max-h-screen -m-6">
<!-- Header -->
<div class="flex flex-0 items-center justify-between h-16 pr-3 sm:pr-5 pl-6 sm:pl-8 bg-primary text-on-primary">
@@ -107,14 +107,14 @@
<!-- Discard -->
<button
class="ml-auto sm:ml-0"
mat-button
mat-stroked-button
(click)="discard()">
Discard
</button>
<!-- Save as draft -->
<button
class="sm:mx-3"
mat-button
mat-stroked-button
(click)="saveAsDraft()">
<span>Save as draft</span>
</button>

View File

@@ -0,0 +1,277 @@
<div class="absolute inset-0 flex flex-col min-w-0 overflow-hidden">
<mat-drawer-container class="flex-auto h-full">
<!-- Drawer -->
<mat-drawer
class="w-80"
[autoFocus]="false"
[mode]="drawerMode"
[opened]="drawerOpened"
#matDrawer>
<div class="flex flex-col flex-auto h-full dark:bg-default">
<!-- Watchlist -->
<div class="flex flex-col flex-0">
<div
class="flex flex-0 items-center p-5 border-b"
*ngFor="let item of data.watchlist">
<div class="flex flex-col flex-auto pr-6">
<div class="flex items-baseline">
<div class="mr-1 font-medium text-md text-secondary">{{item.title}}</div>
<div class="font-medium text-sm text-hint uppercase tracking-wider">({{item.iso}})</div>
</div>
<div class="flex items-end mt-2">
<div class="min-w-20 font-mono text-2xl tracking-tighter leading-none">
{{item.amount | currency:'USD':'symbol':'1.2-4'}}
</div>
<mat-icon
class="text-green-500 icon-size-3.5 mx-0.5 mb-px"
[ngClass]="{'text-green-500': item.trend.dir === 'up', 'text-red-500': item.trend.dir === 'down'}"
[svgIcon]="item.trend.dir === 'up' ? 'heroicons_solid:arrow-narrow-up' : 'heroicons_solid:arrow-narrow-down'"></mat-icon>
<div
class="font-mono font-medium text-sm leading-none mb-px"
[ngClass]="{'text-green-500': item.trend.dir === 'up', 'text-red-500': item.trend.dir === 'down'}">
{{item.trend.amount}}%
</div>
</div>
</div>
<apx-chart
class="flex flex-auto items-center h-10 overflow-hidden"
[chart]="watchlistChartOptions.chart"
[colors]="item.trend.dir === 'up' ? ['#48BB78']: ['#F56565']"
[series]="item.series"
[stroke]="watchlistChartOptions.stroke"
[tooltip]="watchlistChartOptions.tooltip"
[xaxis]="watchlistChartOptions.xaxis"></apx-chart>
</div>
</div>
<!-- Buy / Sell -->
<div class="flex flex-col flex-auto flex-shrink-0 pt-6 bg-gray-50 dark:bg-transparent">
<!-- Action -->
<div class="flex flex-col px-6 pb-2">
<mat-form-field>
<mat-label>Action</mat-label>
<span
class="flex items-center justify-center"
matPrefix>
<ng-container *ngIf="buySellSelect.value === 'buy'">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:download'"></mat-icon>
</ng-container>
<ng-container *ngIf="buySellSelect.value === 'sell'">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:upload'"></mat-icon>
</ng-container>
</span>
<mat-select
[value]="'buy'"
#buySellSelect="matSelect">
<mat-option [value]="'buy'">Buy</mat-option>
<mat-option [value]="'sell'">Sell</mat-option>
</mat-select>
</mat-form-field>
</div>
<!-- Wallet -->
<div class="flex flex-col px-6 pb-2">
<mat-form-field class="w-full">
<mat-label>Wallet</mat-label>
<mat-select
[value]="'btc'"
#walletSelector="matSelect">
<mat-select-trigger>
<span class="flex items-center">
<span>{{walletSelector.triggerValue}}</span>
<span class="mx-1 text-hint">-</span>
<span class="flex items-center font-mono">
<span>{{data.wallets[walletSelector.value]}}</span>
<span class="ml-1">{{walletSelector.value | uppercase}}</span>
</span>
</span>
</mat-select-trigger>
<mat-option [value]="'btc'">Bitcoin</mat-option>
<mat-option [value]="'eth'">Ethereum</mat-option>
<mat-option [value]="'bch'">Bitcoin Cash</mat-option>
<mat-option [value]="'xrp'">XRP</mat-option>
</mat-select>
<mat-hint class="flex items-center">
<span class="mr-1">USD:</span>
<span class="font-mono font-medium text-normal">
{{data.wallets[walletSelector.value] * data.prices[walletSelector.value] | currency:'USD'}}
</span>
</mat-hint>
</mat-form-field>
</div>
<!-- Buy form -->
<form
class="flex flex-col px-6"
*ngIf="buySellSelect.value === 'buy'">
<mat-form-field class="w-full">
<mat-label>Amount</mat-label>
<input
matInput
autocomplete="off"
#buyAmount>
<mat-select
[value]="'coin'"
matSuffix
#buyType="matSelect">
<mat-option [value]="'coin'">{{walletSelector.value | uppercase}}</mat-option>
<mat-option [value]="'usd'">USD</mat-option>
</mat-select>
<span
matPrefix
*ngIf="buyType.value === 'usd'">
$
</span>
<mat-hint class="flex items-center">
<ng-container *ngIf="buyType.value === 'coin'">
<span class="mr-1">It will cost:</span>
<span class="font-mono font-medium text-normal">
{{buyAmount.value * data.prices[walletSelector.value] | currency:'USD':'symbol':'1.2-4'}}
</span>
</ng-container>
<ng-container *ngIf="buyType.value === 'usd'">
<span class="mr-1">You will receive:</span>
<span class="font-mono font-medium text-normal">
{{buyAmount.value / data.prices[walletSelector.value] | number:'1.2-6'}} {{walletSelector.value | uppercase}}
</span>
</ng-container>
</mat-hint>
</mat-form-field>
<button
class="mt-4 mb-8"
mat-flat-button
[color]="'primary'">
BUY
</button>
</form>
<!-- Sell form -->
<form
class="flex flex-col px-6"
*ngIf="buySellSelect.value === 'sell'">
<mat-form-field class="w-full">
<mat-label>Amount</mat-label>
<input
matInput
autocomplete="off"
#sellAmount>
<mat-select
[value]="'coin'"
matSuffix
#sellType="matSelect">
<mat-option [value]="'coin'">{{walletSelector.value | uppercase}}</mat-option>
<mat-option [value]="'usd'">USD</mat-option>
</mat-select>
<span
matPrefix
*ngIf="sellType.value === 'usd'">
$
</span>
<mat-hint class="flex items-center">
<ng-container *ngIf="sellType.value === 'coin'">
<span class="mr-1">You will receive:</span>
<span class="font-mono font-medium text-normal">
{{sellAmount.value * data.prices[walletSelector.value] | currency:'USD':'symbol':'1.2-4'}}
</span>
</ng-container>
<ng-container *ngIf="sellType.value === 'usd'">
<span class="mr-1">You will sell:</span>
<span class="font-mono font-medium text-normal">
{{sellAmount.value / data.prices[walletSelector.value] | number:'1.2-6'}} {{walletSelector.value | uppercase}}
</span>
</ng-container>
</mat-hint>
</mat-form-field>
<button
class="mt-4 mb-8"
mat-flat-button
[color]="'primary'">
SELL
</button>
</form>
</div>
</div>
</mat-drawer>
<!-- Content -->
<mat-drawer-content class="flex flex-col">
<!-- BTC Price -->
<div class="flex flex-col flex-auto min-h-full bg-card dark:bg-default">
<div class="flex flex-wrap items-center pl-4 pr-6 py-3 md:pl-6 border-b">
<button
class="mr-6 lg:hidden"
mat-icon-button
(click)="matDrawer.toggle()">
<mat-icon [svgIcon]="'heroicons_outline:menu'"></mat-icon>
</button>
<div class="flex flex-col flex-auto my-3 mr-6">
<div class="flex items-center">
<div class="font-medium text-2xl text-secondary mr-2">Bitcoin</div>
<div class="font-medium text-lg text-hint tracking-wider">(BTC)</div>
</div>
<div class="flex items-end mt-1">
<div class="mr-2 font-mono text-3xl leading-none tracking-tight">{{data.btc.amount | currency:'USD':'symbol':'1.2-2'}}</div>
<mat-icon
class="text-green-500 icon-size-5 mr-0.5 mb-px"
[ngClass]="{'text-green-500': data.btc.trend.dir === 'up', 'text-red-500': data.btc.trend.dir === 'down'}"
[svgIcon]="data.btc.trend.dir === 'up' ? 'heroicons_solid:arrow-narrow-up' : 'heroicons_solid:arrow-narrow-down'"></mat-icon>
<div
class="font-mono font-medium text-lg leading-none mb-px"
[ngClass]="{'text-green-500': data.btc.trend.dir === 'up', 'text-red-500': data.btc.trend.dir === 'down'}">
{{data.btc.trend.amount}}%
</div>
</div>
</div>
<div class="hidden sm:flex items-center my-3">
<div class="p-4 leading-none rounded-l-xl border border-r-0">
<div class="text-sm font-medium text-secondary">Market Cap</div>
<div class="mt-2 font-mono text-xl">{{(data.btc.marketCap / 1000000000) | number: '1.0-2' | currency}}B</div>
</div>
<div class="p-4 leading-none border border-r-0">
<div class="text-sm font-medium text-secondary">Volume</div>
<div class="mt-2 font-mono text-xl">{{(data.btc.volume / 1000000000) | number: '1.0-2' | currency}}B</div>
</div>
<div class="p-4 leading-none border border-r-0">
<div class="text-sm font-medium text-secondary">Supply</div>
<div class="mt-2 font-mono text-xl">{{(data.btc.supply / 1000000) | number: '1.0-2'}}M</div>
</div>
<div class="p-4 leading-none rounded-r-xl border">
<div class="text-sm font-medium text-secondary">All Time High</div>
<div class="mt-2 font-mono text-xl">{{data.btc.allTimeHigh | currency:'USD'}}</div>
</div>
</div>
</div>
<div class="relative flex flex-auto bg-gray-50 dark:bg-transparent">
<apx-chart
class="relative w-full h-160 md:absolute md:inset-0 md:h-auto overflow-hidden"
[chart]="btcOptions.chart"
[colors]="btcOptions.colors"
[dataLabels]="btcOptions.dataLabels"
[grid]="btcOptions.grid"
[legend]="btcOptions.legend"
[series]="btcOptions.series"
[stroke]="btcOptions.stroke"
[tooltip]="btcOptions.tooltip"
[xaxis]="btcOptions.xaxis"
[yaxis]="btcOptions.yaxis"
#btcChartComponent></apx-chart>
</div>
</div>
</mat-drawer-content>
</mat-drawer-container>
</div>

View File

@@ -0,0 +1,238 @@
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import * as moment from 'moment';
import { ApexOptions, ChartComponent } from 'ng-apexcharts';
import { FuseMediaWatcherService } from '@fuse/services/media-watcher';
import { CryptoService } from 'app/modules/admin/dashboards/crypto/crypto.service';
@Component({
selector : 'crypto',
templateUrl : './crypto.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class CryptoComponent implements OnInit, OnDestroy
{
@ViewChild('btcChartComponent') btcChartComponent: ChartComponent;
appConfig: any;
btcOptions: ApexOptions = {};
data: any;
drawerMode: 'over' | 'side' = 'side';
drawerOpened: boolean = true;
watchlistChartOptions: ApexOptions = {};
private _unsubscribeAll: Subject<any> = new Subject<any>();
/**
* Constructor
*/
constructor(
private _cryptoService: CryptoService,
private _changeDetectorRef: ChangeDetectorRef,
private _fuseMediaWatcherService: FuseMediaWatcherService
)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
/**
* On init
*/
ngOnInit(): void
{
// Subscribe to media changes
this._fuseMediaWatcherService.onMediaChange$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe(({matchingAliases}) => {
// Set the drawerMode and drawerOpened if 'lg' breakpoint is active
if ( matchingAliases.includes('lg') )
{
this.drawerMode = 'side';
this.drawerOpened = true;
}
else
{
this.drawerMode = 'over';
this.drawerOpened = false;
}
// Mark for check
this._changeDetectorRef.markForCheck();
});
// Get the data
this._cryptoService.data$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((data) => {
// Store the data
this.data = data;
// Prepare the chart data
this._prepareChartData();
});
}
/**
* On destroy
*/
ngOnDestroy(): void
{
// Unsubscribe from all subscriptions
this._unsubscribeAll.next();
this._unsubscribeAll.complete();
}
// -----------------------------------------------------------------------------------------------------
// @ Private methods
// -----------------------------------------------------------------------------------------------------
/**
* Prepare the chart data from the data
*
* @private
*/
private _prepareChartData(): void
{
// BTC
this.btcOptions = {
chart : {
animations: {
enabled: false
},
fontFamily: 'inherit',
foreColor : 'inherit',
width : '100%',
height : '100%',
type : 'line',
toolbar : {
show: false
},
zoom : {
enabled: false
}
},
colors : ['#5A67D8'],
dataLabels: {
enabled: false
},
grid : {
borderColor : 'var(--fuse-border)',
position : 'back',
show : true,
strokeDashArray: 6,
xaxis : {
lines: {
show: true
}
},
yaxis : {
lines: {
show: true
}
}
},
legend : {
show: false
},
series : this.data.btc.price.series,
stroke : {
width: 2,
curve: 'straight'
},
tooltip : {
shared: true,
theme : 'dark',
y : {
formatter: (value: number): string => '$' + value.toFixed(2)
}
},
xaxis : {
type : 'numeric',
crosshairs: {
show : true,
position: 'back',
fill : {
type : 'color',
color: 'var(--fuse-border)'
},
width : 3,
stroke : {
dashArray: 0,
width : 0
},
opacity : 0.9
},
tickAmount: 8,
axisTicks : {
show : true,
color: 'var(--fuse-border)'
},
axisBorder: {
show: false
},
tooltip : {
enabled: false
},
labels : {
show : true,
trim : false,
rotate : 0,
minHeight : 40,
hideOverlappingLabels: true,
formatter : (value): string => moment().subtract(Math.abs(parseInt(value, 10)), 'minutes').format('HH:mm'),
style : {
colors: 'currentColor'
}
}
},
yaxis : {
axisTicks : {
show : true,
color: 'var(--fuse-border)'
},
axisBorder : {
show: false
},
forceNiceScale: true,
labels : {
minWidth : 40,
formatter: (value: number): string => '$' + value.toFixed(0),
style : {
colors: 'currentColor'
}
}
}
};
// Watchlist options
this.watchlistChartOptions = {
chart : {
animations: {
enabled: false
},
width : '100%',
height : '100%',
type : 'line',
sparkline : {
enabled: true
}
},
colors : ['#A0AEC0'],
stroke : {
width: 2,
curve: 'smooth'
},
tooltip: {
enabled: false
},
xaxis : {
type: 'category'
}
};
}
}

View File

@@ -0,0 +1,42 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu';
import { MatSelectModule } from '@angular/material/select';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import { MatTabsModule } from '@angular/material/tabs';
import { NgApexchartsModule } from 'ng-apexcharts';
import { SharedModule } from 'app/shared/shared.module';
import { CryptoComponent } from 'app/modules/admin/dashboards/crypto/crypto.component';
import { cryptoRoutes } from 'app/modules/admin/dashboards/crypto/crypto.routing';
@NgModule({
declarations: [
CryptoComponent
],
imports : [
RouterModule.forChild(cryptoRoutes),
MatButtonModule,
MatButtonToggleModule,
MatFormFieldModule,
MatIconModule,
MatInputModule,
MatMenuModule,
MatSelectModule,
MatSidenavModule,
MatSortModule,
MatTableModule,
MatTabsModule,
NgApexchartsModule,
SharedModule
]
})
export class CryptoModule
{
}

View File

@@ -0,0 +1,32 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { CryptoService } from 'app/modules/admin/dashboards/crypto/crypto.service';
@Injectable({
providedIn: 'root'
})
export class CryptoResolver implements Resolve<any>
{
/**
* Constructor
*/
constructor(private _cryptoService: CryptoService)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Resolver
*
* @param route
* @param state
*/
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any>
{
return this._cryptoService.getData();
}
}

View File

@@ -0,0 +1,13 @@
import { Route } from '@angular/router';
import { CryptoComponent } from 'app/modules/admin/dashboards/crypto/crypto.component';
import { CryptoResolver } from 'app/modules/admin/dashboards/crypto/crypto.resolvers';
export const cryptoRoutes: Route[] = [
{
path : '',
component: CryptoComponent,
resolve : {
data: CryptoResolver
}
}
];

View File

@@ -0,0 +1,47 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject, Observable } from 'rxjs';
import { tap } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class CryptoService
{
private _data: BehaviorSubject<any> = new BehaviorSubject(null);
/**
* Constructor
*/
constructor(private _httpClient: HttpClient)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Accessors
// -----------------------------------------------------------------------------------------------------
/**
* Getter for data
*/
get data$(): Observable<any>
{
return this._data.asObservable();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Get data
*/
getData(): Observable<any>
{
return this._httpClient.get('api/dashboards/crypto').pipe(
tap((response: any) => {
this._data.next(response);
})
);
}
}

View File

@@ -0,0 +1,526 @@
<div class="flex flex-col flex-auto w-full">
<div class="flex flex-wrap w-full max-w-screen-xl mx-auto p-6 md:p-8">
<!-- Title and action buttons -->
<div class="flex items-center justify-between w-full">
<div>
<h2 class="text-3xl font-semibold tracking-tight leading-8">Finance dashboard</h2>
<div class="font-medium tracking-tight text-secondary">Keep track of your financial status</div>
</div>
<div class="flex items-center ml-6">
<button
class="hidden sm:inline-flex"
mat-stroked-button>
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:document-report'"></mat-icon>
<span class="ml-2">Reports</span>
</button>
<button
class="hidden sm:inline-flex ml-3"
mat-stroked-button>
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:cog'"></mat-icon>
<span class="ml-2">Settings</span>
</button>
<button
class="hidden sm:inline-flex ml-3"
mat-flat-button
[color]="'primary'">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:save'"></mat-icon>
<span class="ml-2">Export</span>
</button>
<!-- Actions menu (visible on xs) -->
<div class="sm:hidden">
<button
[matMenuTriggerFor]="actionsMenu"
mat-icon-button>
<mat-icon [svgIcon]="'heroicons_outline:dots-vertical'"></mat-icon>
</button>
<mat-menu #actionsMenu="matMenu">
<button mat-menu-item>Export</button>
<button mat-menu-item>Reports</button>
<button mat-menu-item>Settings</button>
</mat-menu>
</div>
</div>
</div>
<div class="grid grid-cols-1 xl:grid-cols-2 gap-8 w-full mt-8">
<div class="grid gap-8 sm:grid-flow-col xl:grid-flow-row">
<!-- Previous statement -->
<div class="relative flex flex-col flex-auto p-6 pr-3 pb-3 bg-card rounded-2xl shadow overflow-hidden">
<div class="absolute bottom-0 right-0 w-24 h-24 -m-6">
<mat-icon
class="icon-size-24 opacity-25 text-green-500 dark:text-green-400"
[svgIcon]="'heroicons_outline:check-circle'"></mat-icon>
</div>
<div class="flex items-center">
<div class="flex flex-col">
<div class="text-lg font-medium tracking-tight leading-6 truncate">Previous Statement</div>
<div class="text-green-600 font-medium text-sm">
Paid on {{data.previousStatement.date}}
</div>
</div>
<div class="ml-auto -mt-2">
<button
mat-icon-button
[matMenuTriggerFor]="previousStatementMenu">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:dots-vertical'"></mat-icon>
</button>
<mat-menu #previousStatementMenu="matMenu">
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:credit-card'"></mat-icon>
<span>View statement</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:cash'"></mat-icon>
<span>Spending breakdown</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:receipt-tax'"></mat-icon>
<span>Tax breakdown</span>
</span>
</button>
<mat-divider class="my-2"></mat-divider>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:printer'"></mat-icon>
<span>Print statement</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:mail'"></mat-icon>
<span>Email statement</span>
</span>
</button>
</mat-menu>
</div>
</div>
<div class="flex flex-row flex-wrap mt-4 -mx-6">
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Card Limit</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.previousStatement.limit | currency:'USD'}}</div>
</div>
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Spent</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.previousStatement.spent | currency:'USD'}}</div>
</div>
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Minimum</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.previousStatement.minimum | currency:'USD'}}</div>
</div>
</div>
</div>
<!-- Current statement -->
<div class="relative flex flex-col flex-auto p-6 pr-3 pb-3 bg-card rounded-2xl shadow overflow-hidden">
<div class="absolute bottom-0 right-0 w-24 h-24 -m-6">
<mat-icon
class="icon-size-24 opacity-25 text-red-500 dark:text-red-400"
[svgIcon]="'heroicons_outline:exclamation-circle'"></mat-icon>
</div>
<div class="flex items-center">
<div class="flex flex-col">
<div class="text-lg font-medium tracking-tight leading-6 truncate">Current Statement</div>
<div class="text-red-600 font-medium text-sm">
Must be paid before {{data.currentStatement.date}}
</div>
</div>
<div class="ml-auto -mt-2">
<button
mat-icon-button
[matMenuTriggerFor]="currentStatementMenu">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:dots-vertical'"></mat-icon>
</button>
<mat-menu #currentStatementMenu="matMenu">
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:credit-card'"></mat-icon>
<span>View statement</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:cash'"></mat-icon>
<span>Spending breakdown</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:receipt-tax'"></mat-icon>
<span>Tax breakdown</span>
</span>
</button>
<mat-divider class="my-2"></mat-divider>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:printer'"></mat-icon>
<span>Print statement</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:mail'"></mat-icon>
<span>Email statement</span>
</span>
</button>
</mat-menu>
</div>
</div>
<div class="flex flex-row flex-wrap mt-4 -mx-6">
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Card Limit</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.currentStatement.limit | currency:'USD'}}</div>
</div>
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Spent</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.currentStatement.spent | currency:'USD'}}</div>
</div>
<div class="flex flex-col mx-6 my-3">
<div class="text-sm font-medium leading-none text-secondary">Minimum</div>
<div class="mt-2 font-medium text-3xl leading-none">{{data.currentStatement.minimum | currency:'USD'}}</div>
</div>
</div>
</div>
</div>
<!-- Account balance -->
<div class="flex flex-col flex-auto bg-card shadow rounded-2xl overflow-hidden">
<div class="flex flex-col p-6 pb-4">
<div class="flex items-center justify-between">
<div class="flex flex-col">
<div class="mr-4 text-lg font-medium tracking-tight leading-6 truncate">Account Balance</div>
<div class="text-secondary font-medium">Monthly balance growth and avg. monthly income</div>
</div>
<div class="ml-2">
<button
class="h-6 min-h-6 px-2 rounded-full bg-hover"
mat-button
[matMenuTriggerFor]="accountBalanceMenu">
<span class="font-medium text-sm text-secondary">12 months</span>
</button>
<mat-menu #accountBalanceMenu="matMenu">
<button mat-menu-item>3 months</button>
<button mat-menu-item>6 months</button>
<button mat-menu-item>9 months</button>
<button mat-menu-item>12 months</button>
</mat-menu>
</div>
</div>
<div class="flex items-start mt-6 mr-2">
<div class="flex flex-col">
<div class="font-semibold text-3xl md:text-5xl tracking-tighter">{{data.accountBalance.growRate}}%</div>
<div class="font-medium text-sm text-secondary leading-none">Average Monthly Growth</div>
</div>
<div class="flex flex-col ml-8 md:ml-16">
<div class="font-semibold text-3xl md:text-5xl tracking-tighter">{{data.accountBalance.ami | currency:'USD'}}</div>
<div class="font-medium text-sm text-secondary leading-none">Average Monthly Income</div>
</div>
</div>
</div>
<div class="flex flex-col flex-auto">
<apx-chart
class="flex-auto w-full h-full"
[chart]="accountBalanceOptions.chart"
[colors]="accountBalanceOptions.colors"
[fill]="accountBalanceOptions.fill"
[series]="accountBalanceOptions.series"
[stroke]="accountBalanceOptions.stroke"
[tooltip]="accountBalanceOptions.tooltip"
[xaxis]="accountBalanceOptions.xaxis"></apx-chart>
</div>
</div>
</div>
<div class="grid grid-cols-1 xl:grid-cols-3 gap-8 w-full mt-8">
<!-- Recent transactions table -->
<div class="xl:col-span-2 flex flex-col flex-auto bg-card shadow rounded-2xl overflow-hidden">
<div class="p-6">
<div class="mr-4 text-lg font-medium tracking-tight leading-6 truncate">Recent transactions</div>
<div class="text-secondary font-medium">1 pending, 4 completed</div>
</div>
<div class="overflow-x-auto mx-6">
<table
class="w-full bg-transparent"
mat-table
matSort
[dataSource]="recentTransactionsDataSource"
[trackBy]="trackByFn"
#recentTransactionsTable>
<!-- Transaction ID -->
<ng-container matColumnDef="transactionId">
<th
mat-header-cell
mat-sort-header
*matHeaderCellDef>
Transaction ID
</th>
<td
mat-cell
*matCellDef="let transaction">
<span class="pr-6 font-medium text-sm text-secondary whitespace-nowrap">
{{transaction.transactionId}}
</span>
</td>
</ng-container>
<!-- Date -->
<ng-container matColumnDef="date">
<th
mat-header-cell
mat-sort-header
*matHeaderCellDef>
Date
</th>
<td
mat-cell
*matCellDef="let transaction">
<span class="pr-6 whitespace-nowrap">
{{transaction.date | date:'MMM dd, y'}}
</span>
</td>
</ng-container>
<!-- Name -->
<ng-container matColumnDef="name">
<th
mat-header-cell
mat-sort-header
*matHeaderCellDef>
Name
</th>
<td
mat-cell
*matCellDef="let transaction">
<span class="pr-6 whitespace-nowrap">
{{transaction.name}}
</span>
</td>
</ng-container>
<!-- Amount -->
<ng-container matColumnDef="amount">
<th
mat-header-cell
mat-sort-header
*matHeaderCellDef>
Amount
</th>
<td
mat-cell
*matCellDef="let transaction">
<span class="pr-6 font-medium whitespace-nowrap">
{{transaction.amount | currency:'USD'}}
</span>
</td>
</ng-container>
<!-- Status -->
<ng-container matColumnDef="status">
<th
mat-header-cell
mat-sort-header
*matHeaderCellDef>
Status
</th>
<td
mat-cell
*matCellDef="let transaction">
<span
class="inline-flex items-center font-bold text-xs px-2.5 py-0.5 rounded-full tracking-wide uppercase"
[ngClass]="{'bg-red-200 text-red-800 dark:bg-red-600 dark:text-red-50': transaction.status === 'pending',
'bg-green-200 text-green-800 dark:bg-green-600 dark:text-green-50': transaction.status === 'completed'}">
<span class="leading-relaxed whitespace-nowrap">{{transaction.status}}</span>
</span>
</td>
</ng-container>
<!-- Footer -->
<ng-container matColumnDef="recentOrdersTableFooter">
<td
class="py-6 px-0 border-0"
mat-footer-cell
*matFooterCellDef
colspan="6">
<button mat-stroked-button>See all transactions</button>
</td>
</ng-container>
<tr
mat-header-row
*matHeaderRowDef="recentTransactionsTableColumns"></tr>
<tr
class="order-row h-16"
mat-row
*matRowDef="let row; columns: recentTransactionsTableColumns;"></tr>
<tr
class="h-16 border-0"
mat-footer-row
*matFooterRowDef="['recentOrdersTableFooter']"></tr>
</table>
</div>
</div>
<!-- Budget -->
<div class="flex flex-col flex-auto p-6 bg-card rounded-2xl shadow">
<div class="flex items-center">
<div class="flex flex-col">
<div class="mr-4 text-lg font-medium tracking-tight leading-6 truncate">Budget</div>
<div class="text-secondary font-medium">Monthly budget summary</div>
</div>
<div class="ml-auto -mt-2 -mr-2">
<button
mat-icon-button
[matMenuTriggerFor]="budgetMenu">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:dots-vertical'"></mat-icon>
</button>
<mat-menu #budgetMenu="matMenu">
<button mat-menu-item>Expenses breakdown</button>
<button mat-menu-item>Savings breakdown</button>
<button mat-menu-item>Bills breakdown</button>
<mat-divider class="my-2"></mat-divider>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:printer'"></mat-icon>
<span>Print budget summary</span>
</span>
</button>
<button mat-menu-item>
<span class="flex items-center">
<mat-icon
class="icon-size-5 mr-3"
[svgIcon]="'heroicons_solid:mail'"></mat-icon>
<span>Email budget summary</span>
</span>
</button>
</mat-menu>
</div>
</div>
<div class="mt-6">
Last month; you had <strong>223</strong> expense transactions, <strong>12</strong> savings entries and <strong>4</strong> bills.
</div>
<div class="my-8 space-y-8">
<div class="flex flex-col">
<div class="flex items-center">
<div class="flex items-center justify-center w-14 h-14 rounded bg-red-100 text-red-800 dark:bg-red-600 dark:text-red-50">
<mat-icon
class="text-current"
[svgIcon]="'heroicons_outline:credit-card'"></mat-icon>
</div>
<div class="flex-auto ml-4 leading-none">
<div class="text-sm font-medium text-secondary">Expenses</div>
<div class="mt-2 font-medium text-2xl">{{data.budget.expenses | currency:'USD'}}</div>
<mat-progress-bar
class="mt-3 rounded-full"
[color]="'warn'"
[mode]="'determinate'"
[value]="(data.budget.expenses * 100) / data.budget.expensesLimit"></mat-progress-bar>
</div>
<div class="flex items-end justify-end min-w-18 mt-auto ml-6">
<div class="text-lg leading-none">2.6%</div>
<mat-icon
class="text-green-600 icon-size-4 ml-1"
[svgIcon]="'heroicons_solid:arrow-narrow-down'"></mat-icon>
</div>
</div>
</div>
<div class="flex flex-col">
<div class="flex items-center">
<div class="flex items-center justify-center w-14 h-14 rounded bg-indigo-100 text-indigo-800 dark:bg-indigo-600 dark:text-indigo-50">
<mat-icon
class="text-current"
[svgIcon]="'heroicons_outline:cash'"></mat-icon>
</div>
<div class="flex-auto ml-4 leading-none">
<div class="text-sm font-medium text-secondary">Savings</div>
<div class="mt-2 font-medium text-2xl">{{data.budget.savings | currency:'USD'}}</div>
<mat-progress-bar
class="mt-3 rounded-full"
[mode]="'determinate'"
[value]="(data.budget.savings * 100) / data.budget.savingsGoal"></mat-progress-bar>
</div>
<div class="flex items-end justify-end min-w-18 mt-auto ml-6">
<div class="text-lg leading-none">12.7%</div>
<mat-icon
class="text-red-600 icon-size-4 ml-1"
[svgIcon]="'heroicons_solid:arrow-narrow-up'"></mat-icon>
</div>
</div>
</div>
<div class="flex flex-col">
<div class="flex items-center">
<div class="flex items-center justify-center w-14 h-14 rounded bg-teal-100 text-teal-800 dark:bg-teal-600 dark:text-teal-50">
<mat-icon
class="text-current"
[svgIcon]="'heroicons_outline:light-bulb'"></mat-icon>
</div>
<div class="flex-auto ml-4 leading-none">
<div class="text-sm font-medium text-secondary">Bills</div>
<div class="mt-2 font-medium text-2xl">{{data.budget.bills | currency:'USD'}}</div>
<mat-progress-bar
class="mt-3 rounded-full"
[mode]="'determinate'"
[value]="(data.budget.bills * 100) / data.budget.billsLimit"></mat-progress-bar>
</div>
<div class="flex items-end justify-end min-w-18 mt-auto ml-6">
<div class="text-lg leading-none">105.7%</div>
<mat-icon
class="text-red-600 icon-size-4 ml-1"
[svgIcon]="'heroicons_solid:arrow-narrow-up'"></mat-icon>
</div>
</div>
<div class="mt-3 text-md text-secondary">Exceeded your personal limit! Be careful next month.</div>
</div>
</div>
<div class="flex items-center mt-auto">
<button
class="mt-2"
mat-stroked-button>
Download Summary
</button>
</div>
</div>
</div>
</div>
</div>

View File

@@ -0,0 +1,146 @@
import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
import { MatSort } from '@angular/material/sort';
import { MatTableDataSource } from '@angular/material/table';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { ApexOptions } from 'ng-apexcharts';
import { FinanceService } from 'app/modules/admin/dashboards/finance/finance.service';
@Component({
selector : 'finance',
templateUrl : './finance.component.html',
encapsulation : ViewEncapsulation.None,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class FinanceComponent implements OnInit, AfterViewInit, OnDestroy
{
@ViewChild('recentTransactionsTable', {read: MatSort}) recentTransactionsTableMatSort: MatSort;
data: any;
accountBalanceOptions: ApexOptions;
recentTransactionsDataSource: MatTableDataSource<any> = new MatTableDataSource();
recentTransactionsTableColumns: string[] = ['transactionId', 'date', 'name', 'amount', 'status'];
private _unsubscribeAll: Subject<any> = new Subject<any>();
/**
* Constructor
*/
constructor(private _financeService: FinanceService)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
/**
* On init
*/
ngOnInit(): void
{
// Get the data
this._financeService.data$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((data) => {
// Store the data
this.data = data;
// Store the table data
this.recentTransactionsDataSource.data = data.recentTransactions;
// Prepare the chart data
this._prepareChartData();
});
}
/**
* After view init
*/
ngAfterViewInit(): void
{
// Make the data source sortable
this.recentTransactionsDataSource.sort = this.recentTransactionsTableMatSort;
}
/**
* On destroy
*/
ngOnDestroy(): void
{
// Unsubscribe from all subscriptions
this._unsubscribeAll.next();
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
// -----------------------------------------------------------------------------------------------------
/**
* Prepare the chart data from the data
*
* @private
*/
private _prepareChartData(): void
{
// Account balance
this.accountBalanceOptions = {
chart : {
animations: {
speed : 400,
animateGradually: {
enabled: false
}
},
fontFamily: 'inherit',
foreColor : 'inherit',
width : '100%',
height : '100%',
type : 'area',
sparkline : {
enabled: true
}
},
colors : ['#A3BFFA', '#667EEA'],
fill : {
colors : ['#CED9FB', '#AECDFD'],
opacity: 0.5,
type : 'solid'
},
series : this.data.accountBalance.series,
stroke : {
curve: 'straight',
width: 2
},
tooltip: {
followCursor: true,
theme : 'dark',
x : {
format: 'MMM dd, yyyy'
},
y : {
formatter: (value): string => value + '%'
}
},
xaxis : {
type: 'datetime'
}
};
}
}

View File

@@ -0,0 +1,34 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
import { NgApexchartsModule } from 'ng-apexcharts';
import { SharedModule } from 'app/shared/shared.module';
import { FinanceComponent } from 'app/modules/admin/dashboards/finance/finance.component';
import { financeRoutes } from 'app/modules/admin/dashboards/finance/finance.routing';
@NgModule({
declarations: [
FinanceComponent
],
imports : [
RouterModule.forChild(financeRoutes),
MatButtonModule,
MatDividerModule,
MatIconModule,
MatMenuModule,
MatProgressBarModule,
MatSortModule,
MatTableModule,
NgApexchartsModule,
SharedModule
]
})
export class FinanceModule
{
}

View File

@@ -0,0 +1,32 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import { FinanceService } from 'app/modules/admin/dashboards/finance/finance.service';
@Injectable({
providedIn: 'root'
})
export class FinanceResolver implements Resolve<any>
{
/**
* Constructor
*/
constructor(private _financeService: FinanceService)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Resolver
*
* @param route
* @param state
*/
resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<any>
{
return this._financeService.getData();
}
}

View File

@@ -0,0 +1,13 @@
import { Route } from '@angular/router';
import { FinanceComponent } from 'app/modules/admin/dashboards/finance/finance.component';
import { FinanceResolver } from 'app/modules/admin/dashboards/finance/finance.resolvers';
export const financeRoutes: Route[] = [
{
path : '',
component: FinanceComponent,
resolve : {
data: FinanceResolver
}
}
];

View File

@@ -0,0 +1,47 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject, Observable } from 'rxjs';
import { tap } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class FinanceService
{
private _data: BehaviorSubject<any> = new BehaviorSubject(null);
/**
* Constructor
*/
constructor(private _httpClient: HttpClient)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Accessors
// -----------------------------------------------------------------------------------------------------
/**
* Getter for data
*/
get data$(): Observable<any>
{
return this._data.asObservable();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Get data
*/
getData(): Observable<any>
{
return this._httpClient.get('api/dashboards/finance').pipe(
tap((response: any) => {
this._data.next(response);
})
);
}
}

View File

@@ -1,7 +1,7 @@
<div class="flex flex-col flex-auto min-w-0">
<!-- Header -->
<div class="dark bg-card dark:border-b">
<div class="bg-card">
<div class="flex flex-col w-full max-w-screen-xl mx-auto px-6 sm:px-8">
<div class="flex flex-col sm:flex-row flex-auto sm:items-center min-w-0 my-8 sm:my-12">
<!-- Avatar and name -->
@@ -26,7 +26,7 @@
<!-- Actions -->
<div class="flex items-center mt-6 sm:mt-0 sm:ml-2 space-x-3">
<button
class="fuse-mat-button-rounded bg-accent-600"
class="fuse-mat-button-rounded bg-accent-700"
mat-flat-button
[color]="'accent'">
<mat-icon
@@ -46,43 +46,47 @@
</div>
</div>
<!-- Project selector -->
<div class="flex items-center">
<div class="px-4 py-2 rounded-tl-xl overflow-hidden bg-hover">
<div class="sm:text-lg leading-6 truncate">{{selectedProject}}</div>
<div
class="relative flex self-start pt-2 pb-1 pl-5 pr-4 cursor-pointer overflow-hidden rounded-t-xl border border-b-0 bg-default"
matRipple
[matMenuTriggerFor]="projectsMenu">
<div class="flex items-center">
<div class="overflow-hidden">
<div class="font-medium leading-6 truncate">{{selectedProject}}</div>
</div>
<div class="flex items-center justify-center pl-2">
<mat-icon
class="icon-size-5"
[svgIcon]="'heroicons_solid:chevron-down'"></mat-icon>
</div>
</div>
<div class="ml-px rounded-tr-xl bg-hover">
<mat-menu
#projectsMenu="matMenu"
[xPosition]="'before'">
<button
[matMenuTriggerFor]="projectsMenu"
mat-icon-button>
<mat-icon [svgIcon]="'heroicons_outline:dots-horizontal'"></mat-icon>
mat-menu-item
(click)="selectedProject='ACME Corp. Backend App'">ACME Corp. Backend App
</button>
<mat-menu #projectsMenu="matMenu">
<button
mat-menu-item
(click)="selectedProject='ACME Corp. Backend App'">ACME Corp. Backend App
</button>
<button
mat-menu-item
(click)="selectedProject='ACME Corp. Frontend App'">ACME Corp. Frontend App
</button>
<button
mat-menu-item
(click)="selectedProject='Creapond'">Creapond
</button>
<button
mat-menu-item
(click)="selectedProject='Withinpixels'">Withinpixels
</button>
</mat-menu>
</div>
<button
mat-menu-item
(click)="selectedProject='ACME Corp. Frontend App'">ACME Corp. Frontend App
</button>
<button
mat-menu-item
(click)="selectedProject='Creapond'">Creapond
</button>
<button
mat-menu-item
(click)="selectedProject='Withinpixels'">Withinpixels
</button>
</mat-menu>
</div>
</div>
</div>
<!-- Main -->
<div class="flex-auto mt-4 sm:mt-6">
<div class="flex-auto border-t -mt-px pt-4 sm:pt-6">
<div class="w-full max-w-screen-xl mx-auto">
<!-- Tabs -->
<mat-tab-group
class="sm:px-2"
@@ -114,7 +118,7 @@
<div class="flex flex-col items-center mt-2">
<div class="text-7xl sm:text-8xl font-bold tracking-tight leading-none text-blue-500">21</div>
<div class="text-lg font-medium text-blue-600 dark:text-blue-500">Due Tasks</div>
<div class="flex items-center justify-center w-full mt-5 text-secondary">
<div class="flex items-baseline justify-center w-full mt-5 text-secondary">
<div class="text-md font-medium truncate">Completed:</div>
<div class="ml-1.5 text-lg font-semibold">13</div>
</div>
@@ -142,7 +146,7 @@
<div class="flex flex-col items-center mt-2">
<div class="text-7xl sm:text-8xl font-bold tracking-tight leading-none text-red-500">17</div>
<div class="text-lg font-medium text-red-600 dark:text-red-500">Tasks</div>
<div class="flex items-center justify-center w-full mt-5 text-secondary">
<div class="flex items-baseline justify-center w-full mt-5 text-secondary">
<div class="text-md font-medium truncate">From yesterday:</div>
<div class="ml-1.5 text-lg font-semibold">9</div>
</div>
@@ -170,7 +174,7 @@
<div class="flex flex-col items-center mt-2">
<div class="text-7xl sm:text-8xl font-bold tracking-tight leading-none text-amber-500">24</div>
<div class="text-lg font-medium text-amber-600 dark:text-amber-500">Open</div>
<div class="flex items-center justify-center w-full mt-5 text-secondary">
<div class="flex items-baseline justify-center w-full mt-5 text-secondary">
<div class="text-md font-medium truncate">Closed today:</div>
<div class="ml-1.5 text-lg font-semibold">19</div>
</div>
@@ -198,7 +202,7 @@
<div class="flex flex-col items-center mt-2">
<div class="text-7xl sm:text-8xl font-bold tracking-tight leading-none text-green-500">38</div>
<div class="text-lg font-medium text-green-600 dark:text-green-500">Proposals</div>
<div class="flex items-center justify-center w-full mt-5 text-secondary">
<div class="flex items-baseline justify-center w-full mt-5 text-secondary">
<div class="text-md font-medium truncate">Implemented:</div>
<div class="ml-1.5 text-lg font-semibold">16</div>
</div>
@@ -680,7 +684,6 @@
mat-row
*matRowDef="let row; columns: data.budgetDetails.columns;"></tr>
</table>
</div>
</div>
</div>
@@ -729,7 +732,6 @@
</mat-tab>
</mat-tab-group>
</div>
</div>

View File

@@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatRippleModule } from '@angular/material/core';
import { MatSidenavModule } from '@angular/material/sidenav';
import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
@@ -28,6 +29,7 @@ import { projectRoutes } from 'app/modules/admin/dashboards/project/project.rout
MatIconModule,
MatMenuModule,
MatProgressBarModule,
MatRippleModule,
MatSidenavModule,
MatSortModule,
MatTableModule,

View File

@@ -4,13 +4,68 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
@Component({
selector : 'changelog',
templateUrl : './changelog.html',
styles : [''],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class ChangelogComponent
{
changelog: any[] = [
// v13.5.0
{
version : 'v13.5.0',
releaseDate: 'Aug 13, 2021',
changes : [
{
type: 'Changed',
list: [
'Huge performance improvement due to Angular v12.2.0',
'(dependencies) Updated Angular & Angular Material to v12.2.1',
'(dependencies) Updated various other packages',
'(tailwindcss) Removed old jsdoc from the config file',
'(@fuse/theming) Better structuring on the themes.scss file',
'(@fuse) Disabled Angular Material "theme" sanity check since we use "all-component-themes" without a color map',
'(apps/mailbox) Style improvements',
'Removed empty "styles" from component decorators',
'Decreased budget sizes since new Fuse is a lot smaller compared to the one with the old design'
]
},
{
type: 'Fixed',
list: [
'(@fuse/overrides) Quill editor is not styled correctly by default',
'(@fuse/confirmation) Dialog size cannot be updated using dialogRef\'s "updateSize" method',
'(apps/mailbox) Compose dialog doesn\'t work correctly on small height resolutions',
'(ui/page-layouts) Demo layout navigation appearance is not correct'
]
}
]
},
// v13.4.0
{
version : 'v13.4.0',
releaseDate: 'July 29, 2021',
changes : [
{
type: 'Added',
list: [
'(dashboards/finance) Added finance dashboard',
'(dashboards/crypto) Added crypto dashboard'
]
},
{
type: 'Changed',
list: [
'(dependencies) Updated Angular & Angular Material to v12.1.4',
'(dependencies) Updated various other packages',
'(index) Updated the title, description and keywords',
'(dashboards/project) Light header on light themes and small adjustments in various places',
'(apps/contacts) Small adjustments for better consistency',
'(apps/ecommerce/inventory) Small adjustments for better consistency',
'(docs) Updated the multi language guide'
]
}
]
},
// v13.3.1
{
version : 'v13.3.1',

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'jwt',
templateUrl: './jwt.html',
styles : ['']
templateUrl: './jwt.html'
})
export class JwtComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'component-theming',
templateUrl: './component-theming.html',
styles : ['']
templateUrl: './component-theming.html'
})
export class ComponentThemingComponent
{

View File

@@ -65,7 +65,7 @@
<ol>
<li>Navigate to <code>src/app/core/core.module.ts</code> file and remove imports of <code>TranslocoCoreModule</code></li>
<li>Remove the <code>src/app/core/transloco</code> directory</li>
<li>Do a project wide search for <code>&lt;language&gt;&lt;/language&gt;</code> and remove all instances</li>
<li>Do a project wide search for <code>&lt;languages&gt;&lt;/languages&gt;</code> and remove all instances</li>
<li>Do a project wide search for <code>LanguageModule</code> and remove all imports</li>
<li>Remove the <code>src/app/layout/common/language</code> directory</li>
<li>Finally navigate to the <code>package.json</code> file, remove the <strong>"@ngneat/transloco"</strong> from dependencies list and run <code>npm install</code> command</li>

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'multi-language',
templateUrl: './multi-language.html',
styles : ['']
templateUrl: './multi-language.html'
})
export class MultiLanguageCustomizationComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'page-layouts',
templateUrl: './page-layouts.html',
styles : ['']
templateUrl: './page-layouts.html'
})
export class PageLayoutsComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'splash-screen',
templateUrl: './splash-screen.html',
styles : ['']
templateUrl: './splash-screen.html'
})
export class SplashScreenCustomizationComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'tailwindcss',
templateUrl: './tailwindcss.html',
styles : ['']
templateUrl: './tailwindcss.html'
})
export class TailwindCSSComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'theme-layouts',
templateUrl: './theme-layouts.html',
styles : ['']
templateUrl: './theme-layouts.html'
})
export class ThemeLayoutsComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'theming',
templateUrl: './theming.html',
styles : ['']
templateUrl: './theming.html'
})
export class ThemingComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'component-structure',
templateUrl: './component-structure.html',
styles : ['']
templateUrl: './component-structure.html'
})
export class ComponentStructureComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'deployment',
templateUrl: './deployment.html',
styles : ['']
templateUrl: './deployment.html'
})
export class DeploymentComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'starter-kit',
templateUrl: './starter-kit.html',
styles : ['']
templateUrl: './starter-kit.html'
})
export class StarterKitComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'updating',
templateUrl: './updating.html',
styles : ['']
templateUrl: './updating.html'
})
export class UpdatingComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'installation',
templateUrl: './installation.html',
styles : ['']
templateUrl: './installation.html'
})
export class InstallationComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'introduction',
templateUrl: './introduction.html',
styles : ['']
templateUrl: './introduction.html'
})
export class IntroductionComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'prerequisites',
templateUrl: './prerequisites.html',
styles : ['']
templateUrl: './prerequisites.html'
})
export class PrerequisitesComponent
{

View File

@@ -3,8 +3,7 @@ import { GuidesComponent } from 'app/modules/admin/docs/guides/guides.component'
@Component({
selector : 'serving',
templateUrl: './serving.html',
styles : ['']
templateUrl: './serving.html'
})
export class ServingComponent
{

View File

@@ -24,7 +24,7 @@
<div class="max-w-3xl">
<div class="max-w-3xl prose prose-sm">
<p>
One of the repetitive and tedious jobs in Angular is to create confirmation dialogs. Since dialogs require their own component
One of the repetitive and tedious jobs in Angular is to create confirmation dialogs. Since dialogs require their own components
you have to either create a separate component every time you need a confirmation dialog or you have to create your own
confirmation dialog system that can be configured.
</p>

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'card',
templateUrl: './card.component.html',
styles : ['']
templateUrl: './card.component.html'
})
export class CardComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'date-range',
templateUrl: './date-range.component.html',
styles : ['']
templateUrl: './date-range.component.html'
})
export class DateRangeComponent
{

View File

@@ -4,8 +4,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'drawer',
templateUrl: './drawer.component.html',
styles : ['']
templateUrl: './drawer.component.html'
})
export class DrawerComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'fullscreen',
templateUrl: './fullscreen.component.html',
styles : ['']
templateUrl: './fullscreen.component.html'
})
export class FullscreenComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'highlight',
templateUrl: './highlight.component.html',
styles : ['']
templateUrl: './highlight.component.html'
})
export class HighlightComponent
{

View File

@@ -6,8 +6,7 @@ import { takeUntil } from 'rxjs/operators';
@Component({
selector : 'masonry',
templateUrl: './masonry.component.html',
styles : ['']
templateUrl: './masonry.component.html'
})
export class MasonryComponent implements OnInit
{

View File

@@ -4,8 +4,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'navigation',
templateUrl: './navigation.component.html',
styles : ['']
templateUrl: './navigation.component.html'
})
export class NavigationComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'scroll-reset',
templateUrl: './scroll-reset.component.html',
styles : ['']
templateUrl: './scroll-reset.component.html'
})
export class ScrollResetComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'scrollbar',
templateUrl: './scrollbar.component.html',
styles : ['']
templateUrl: './scrollbar.component.html'
})
export class ScrollbarComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'mock-api',
templateUrl: './mock-api.component.html',
styles : ['']
templateUrl: './mock-api.component.html'
})
export class MockApiComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'find-by-key',
templateUrl: './find-by-key.component.html',
styles : ['']
templateUrl: './find-by-key.component.html'
})
export class FindByKeyComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'config',
templateUrl: './config.component.html',
styles : ['']
templateUrl: './config.component.html'
})
export class ConfigComponent
{

View File

@@ -208,7 +208,21 @@
<h2>MatDialogRef</h2>
<p>
Since <code>FuseConfirmationService</code> uses <em>MatDialog</em> behind the scenes, it returns
a reference to the created dialog. Using that reference, you can access to the user input:
a reference to the created dialog. You can use all available methods from that reference such as
<code>updateSize</code> and <code>updatePosition</code> to further customize the dialog.
</p>
<p>
See
<a
href="https://material.angular.io/components/dialog/api#MatDialogRef"
target="_blank"
rel="noreferrer">
https://material.angular.io/components/dialog/api#MatDialogRef
</a>
for the complete list of available methods.
</p>
<p>
Using the reference, you can also access to the user input:
</p>
<!-- @formatter:off -->
<textarea

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'media-watcher',
templateUrl: './media-watcher.component.html',
styles : ['']
templateUrl: './media-watcher.component.html'
})
export class MediaWatcherComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'splash-screen',
templateUrl: './splash-screen.component.html',
styles : ['']
templateUrl: './splash-screen.component.html'
})
export class SplashScreenComponent
{

View File

@@ -3,8 +3,7 @@ import { FuseComponentsComponent } from 'app/modules/admin/ui/fuse-components/fu
@Component({
selector : 'must-match',
templateUrl: './must-match.component.html',
styles : ['']
templateUrl: './must-match.component.html'
})
export class MustMatchComponent
{

View File

@@ -3,8 +3,7 @@ import { OtherComponentsComponent } from 'app/modules/admin/ui/other-components/
@Component({
selector : 'overview',
templateUrl: './overview.component.html',
styles : ['']
templateUrl: './overview.component.html'
})
export class OverviewComponent
{

View File

@@ -3,8 +3,7 @@ import { OtherComponentsComponent } from 'app/modules/admin/ui/other-components/
@Component({
selector : 'apex-charts',
templateUrl: './apex-charts.component.html',
styles : ['']
templateUrl: './apex-charts.component.html'
})
export class ApexChartsComponent
{

View File

@@ -3,8 +3,7 @@ import { OtherComponentsComponent } from 'app/modules/admin/ui/other-components/
@Component({
selector : 'full-calendar',
templateUrl: './full-calendar.component.html',
styles : ['']
templateUrl: './full-calendar.component.html'
})
export class FullCalendarComponent
{

View File

@@ -3,8 +3,7 @@ import { OtherComponentsComponent } from 'app/modules/admin/ui/other-components/
@Component({
selector : 'ngx-markdown',
templateUrl: './ngx-markdown.component.html',
styles : ['']
templateUrl: './ngx-markdown.component.html'
})
export class NgxMarkdownComponent
{

View File

@@ -3,8 +3,7 @@ import { OtherComponentsComponent } from 'app/modules/admin/ui/other-components/
@Component({
selector : 'quill-editor',
templateUrl: './quill-editor.component.html',
styles : ['']
templateUrl: './quill-editor.component.html'
})
export class QuillEditorComponent
{

View File

@@ -13,7 +13,7 @@ import { FuseNavigationItem } from '@fuse/components/navigation/navigation.types
<!-- Fixed demo sidebar -->
<div class="mx-6 text-3xl font-bold tracking-tighter">Demo Sidebar</div>
<fuse-vertical-navigation
[appearance]="'classic'"
[appearance]="'default'"
[navigation]="menuData"
[inner]="true"
[mode]="'side'"

View File

@@ -1,15 +1,14 @@
<!doctype html>
<html lang="en">
<head>
<title>Fuse Angular - Material Design Admin Template</title>
<title>Fuse Angular - Angular Template and Starter Kit</title>
<meta charset="utf-8">
<meta
name="description"
content="Angular, Angular Material & TailwindCSS Admin Template">
content="Admin Template and Starter Kit with Angular, Angular Material Components and TailwindCSS">
<meta
name="keywords"
content="Fuse,HTML,CSS,Angular,Angular 2,Angular 4,Angular 5,Angular 6,Angular 7,Angular 8,Angular 9,Angular 10,Material,Material 2">
content="Fuse,HTML,CSS,Angular,Angular 2,Angular 10,Angular 11,Angular 12,Material,Material 2,Angular Components,Tailwind,Tailwind CSS,TailwindCSS,Admin Template,Admin Starter Kit">
<meta
name="viewport"
content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0">

View File

@@ -14,7 +14,8 @@ declare const require: {
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
platformBrowserDynamicTesting()
platformBrowserDynamicTesting(),
{teardown: {destroyAfterEach: true}}
);
// Then we find all the tests.

View File

@@ -63,10 +63,6 @@ const themes = {
/**
* Tailwind configuration
*
* @param isProd
* This will be automatically supplied by the custom Angular builder
* based on the current environment of the application (prod, dev etc.)
*/
const config = {
experimental: {},