Merge remote-tracking branch 'origin/demo' into starter

This commit is contained in:
sercan 2021-07-29 10:21:30 +03:00
commit b874b37db2
8 changed files with 2349 additions and 29 deletions

View File

@ -13,17 +13,17 @@
"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.1.4",
"@angular/cdk": "12.1.4",
"@angular/common": "12.1.4",
"@angular/compiler": "12.1.4",
"@angular/core": "12.1.4",
"@angular/forms": "12.1.4",
"@angular/material": "12.1.4",
"@angular/material-moment-adapter": "12.1.4",
"@angular/platform-browser": "12.1.4",
"@angular/platform-browser-dynamic": "12.1.4",
"@angular/router": "12.1.4",
"@fullcalendar/angular": "4.4.5-beta",
"@fullcalendar/core": "4.4.2",
"@fullcalendar/daygrid": "4.4.2",
@ -33,7 +33,7 @@
"@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",
"lodash-es": "4.17.21",
@ -41,7 +41,7 @@
"ng-apexcharts": "1.5.12",
"ngx-markdown": "12.0.1",
"ngx-quill": "14.1.2",
"perfect-scrollbar": "1.5.1",
"perfect-scrollbar": "1.5.2",
"quill": "1.3.7",
"rrule": "2.6.8",
"rxjs": "6.6.7",
@ -50,31 +50,31 @@
"zone.js": "0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "12.1.2",
"@angular-devkit/build-angular": "12.1.4",
"@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.1.4",
"@angular/compiler-cli": "12.1.4",
"@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/jasmine": "3.8.2",
"@types/lodash": "4.14.171",
"@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.17",
"@typescript-eslint/eslint-plugin": "4.28.5",
"@typescript-eslint/parser": "4.28.5",
"autoprefixer": "10.3.1",
"chroma-js": "2.1.2",
"eslint": "7.30.0",
"eslint": "7.31.0",
"eslint-plugin-import": "2.23.4",
"eslint-plugin-jsdoc": "35.4.3",
"eslint-plugin-jsdoc": "36.0.6",
"eslint-plugin-prefer-arrow": "1.2.3",
"jasmine-core": "3.8.0",
"karma": "6.3.4",
@ -83,8 +83,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

@ -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.4.0').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

@ -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">