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

Merge branch 'master' into skeleton

Browse Source 
# Conflicts:
#	src/app/main/apps/contacts/contacts.component.ts
#	src/app/main/apps/e-commerce/orders/orders.component.ts
#	src/app/main/apps/e-commerce/products/products.component.ts
#	src/app/main/documentation/changelog/changelog.component.html
#	src/app/main/documentation/components/navigation/navigation.component.ts
#	src/app/main/pages/authentication/register/register.component.ts
#	src/app/main/pages/authentication/reset-password-2/reset-password-2.component.ts
#	src/app/navigation/navigation.ts
This commit is contained in:
sercan 2020-07-23 15:25:26 +03:00
commit 45aa7cc026
23 changed files with 4532 additions and 4086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
browserslist → .browserslistrc
View File

14
angular.json
View File

@ -31,7 +31,19 @@
"src/styles.scss"
],
"scripts": [],
"showCircularDependencies": false
"showCircularDependencies": false,
"allowedCommonJsDependencies": [
"lodash",
"@swimlane/dragula",
"chart.js",
"angular-calendar",
"calendar-utils/date-adapters/date-fns",
"contra/emitter",
"crossvent",
"dom-plane",
"dom-set",
"@mattlewis92/dom-autoscroller"
]
},
"configurations": {
"production": {

2
e2e/tsconfig.e2e.json
View File

@ -1,5 +1,5 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",

4
e2e/tsconfig.json
View File

@ -1,9 +1,9 @@
{
"extends": "../tsconfig.json",
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"target": "es2018",
"types": [
"jasmine",
"jasminewd2",

8241
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

104
package.json
View File

@ -1,16 +1,14 @@
{
"name": "fuse",
"version": "9.0.0",
"version": "10.0.0",
"license": "https://themeforest.net/licenses/terms/regular",
"scripts": {
"ng": "ng",
"start": "ng serve --open",
"start-hmr": "ng serve --configuration hmr --source-map=false --hmr-warning=false",
"start-hmr-sourcemaps": "ng serve --configuration hmr --source-map=true --hmr-warning=false",
"build": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev",
"build-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --dev --stats-json",
"build-prod": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod",
"build-prod-stats": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod --stats-json",
"start:mem": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng serve --open",
"build": "ng build",
"build:prod": "ng build --prod",
"build:prod:mem": "node --max_old_space_size=6144 ./node_modules/@angular/cli/bin/ng build --prod",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
@ -19,70 +17,68 @@
"private": true,
"dependencies": {
"@agm/core": "1.1.0",
"@angular/animations": "9.0.0",
"@angular/cdk": "9.0.0",
"@angular/common": "9.0.0",
"@angular/compiler": "9.0.0",
"@angular/core": "9.0.0",
"@angular/flex-layout": "9.0.0-beta.29",
"@angular/forms": "9.0.0",
"@angular/material": "9.0.0",
"@angular/material-moment-adapter": "9.0.0",
"@angular/platform-browser": "9.0.0",
"@angular/platform-browser-dynamic": "9.0.0",
"@angular/router": "9.0.0",
"@angular/animations": "10.0.5",
"@angular/cdk": "10.1.0",
"@angular/common": "10.0.5",
"@angular/compiler": "10.0.5",
"@angular/core": "10.0.5",
"@angular/flex-layout": "10.0.0-beta.32",
"@angular/forms": "10.0.5",
"@angular/material": "10.1.0",
"@angular/material-moment-adapter": "10.1.0",
"@angular/platform-browser": "10.0.5",
"@angular/platform-browser-dynamic": "10.0.5",
"@angular/router": "10.0.5",
"@ngrx/effects": "8.6.0",
"@ngrx/router-store": "8.6.0",
"@ngrx/store": "8.6.0",
"@ngrx/store-devtools": "8.6.0",
"@ngx-translate/core": "12.0.0",
"@ngx-translate/core": "13.0.0",
"@swimlane/dragula": "3.8.0",
"@swimlane/ngx-charts": "13.0.2",
"@swimlane/ngx-datatable": "16.0.3",
"@swimlane/ngx-dnd": "8.1.0",
"@types/prismjs": "1.16.0",
"angular-calendar": "0.28.2",
"angular-in-memory-web-api": "0.9.0",
"@swimlane/ngx-charts": "14.0.0",
"@swimlane/ngx-datatable": "17.1.0",
"@swimlane/ngx-dnd": "8.1.2",
"@types/prismjs": "1.16.1",
"angular-calendar": "0.28.16",
"angular-in-memory-web-api": "0.11.0",
"chart.js": "2.9.3",
"classlist.js": "1.1.20150312",
"d3": "5.15.0",
"date-fns": "2.9.0",
"hammerjs": "2.0.8",
"lodash": "4.17.15",
"moment": "2.24.0",
"ng2-charts": "2.3.0",
"d3": "5.16.0",
"date-fns": "2.15.0",
"lodash": "4.17.19",
"moment": "2.27.0",
"ng2-charts": "2.3.2",
"ngrx-store-freeze": "0.2.4",
"ngx-color-picker": "8.2.0",
"ngx-cookie-service": "2.3.0",
"perfect-scrollbar": "1.4.0",
"prismjs": "1.19.0",
"rxjs": "6.5.4",
"tslib": "1.10.0",
"ngx-color-picker": "9.1.0",
"ngx-cookie-service": "3.1.2",
"perfect-scrollbar": "1.5.0",
"prismjs": "1.20.0",
"rxjs": "6.6.0",
"tslib": "2.0.0",
"web-animations-js": "2.3.2",
"zone.js": "0.10.2"
"zone.js": "0.10.3"
},
"devDependencies": {
"@angular/cli": "9.0.1",
"@angular/compiler-cli": "9.0.0",
"@angular/language-service": "9.0.0",
"@angular-devkit/build-angular": "0.900.1",
"@angularclass/hmr": "2.1.3",
"@angular/cli": "10.0.4",
"@angular/compiler-cli": "10.0.5",
"@angular/language-service": "10.0.5",
"@angular-devkit/build-angular": "0.1000.4",
"@types/jasmine": "3.5.2",
"@types/jasminewd2": "2.0.8",
"@types/lodash": "4.14.149",
"@types/node": "12.12.6",
"codelyzer": "5.2.1",
"codelyzer": "6.0.0",
"jasmine-core": "3.5.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.3.0",
"jasmine-spec-reporter": "5.0.2",
"karma": "5.1.0",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "2.1.1",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.5.1",
"protractor": "5.4.3",
"karma-coverage-istanbul-reporter": "3.0.3",
"karma-jasmine": "3.3.1",
"karma-jasmine-html-reporter": "1.5.4",
"protractor": "7.0.0",
"ts-node": "8.3.0",
"tslint": "5.18.0",
"typescript": "3.7.5",
"webpack-bundle-analyzer": "3.6.0"
"tslint": "6.1.2",
"typescript": "3.9.7",
"webpack-bundle-analyzer": "3.8.0"
}
}

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

@ -42,10 +42,10 @@
<ng-template #itemContent>
<mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
<span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
<span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
<span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
[ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
{{(item.badge.translate | translate) || item.badge.title}}
{{item.badge.title}}
</span>
<mat-icon class="collapsable-arrow">keyboard_arrow_right</mat-icon>
</ng-template>

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

@ -38,10 +38,10 @@
<ng-template #itemContent>
<mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
<span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
<span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
<span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
[ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
{{(item.badge.translate | translate) || item.badge.title}}
{{item.badge.title}}
</span>
</ng-template>

4
src/@fuse/components/navigation/vertical/collapsable/collapsable.component.html
View File

@ -45,10 +45,10 @@
<ng-template #itemContent>
<mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
<span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
<span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
<span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
[ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
{{(item.badge.translate | translate) || item.badge.title}}
{{item.badge.title}}
</span>
<mat-icon class="collapsable-arrow">keyboard_arrow_right</mat-icon>
</ng-template>

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

@ -1,7 +1,7 @@
<ng-container *ngIf="!item.hidden">
<div class="group-title" [ngClass]="item.classes">
<span class="hint-text" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
<span class="hint-text" [translate]="item.translate">{{item.title}}</span>
</div>
<div class="group-items">

4
src/@fuse/components/navigation/vertical/item/item.component.html
View File

@ -38,10 +38,10 @@
<ng-template #itemContent>
<mat-icon class="nav-link-icon" *ngIf="item.icon">{{item.icon}}</mat-icon>
<span class="nav-link-title" [translate]="item.translate">{{(item.translate | translate) || item.title}}</span>
<span class="nav-link-title" [translate]="item.translate">{{item.title}}</span>
<span class="nav-link-badge" *ngIf="item.badge" [translate]="item.badge.translate"
[ngStyle]="{'background-color': item.badge.bg,'color': item.badge.fg}">
{{(item.badge.translate | translate) || item.badge.title}}
{{item.badge.title}}
</span>
</ng-template>

2
src/@fuse/components/search-bar/search-bar.component.scss
View File

@ -74,7 +74,7 @@
}
.fuse-search-bar-collapser {
display: flex;
display: inline-block;
}
}
}

10
src/app/app.component.ts
View File

@ -86,17 +86,17 @@ export class AppComponent implements OnInit, OnDestroy
* This is related to ngxTranslate module and below there is a temporary fix while we
* are moving the multi language implementation over to the Angular's core language
* service.
**/
*/
// Set the default language to 'en' and then back to 'tr'.
// '.use' cannot be used here as ngxTranslate won't switch to a language that's already
// been selected and there is no way to force it, so we overcome the issue by switching
// the default language back and forth.
/**
setTimeout(() => {
this._translateService.setDefaultLang('en');
this._translateService.setDefaultLang('tr');
});
* setTimeout(() => {
* this._translateService.setDefaultLang('en');
* this._translateService.setDefaultLang('tr');
* });
*/
/**

1
src/app/app.module.ts
View File

@ -7,7 +7,6 @@ import { MatMomentDateModule } from '@angular/material-moment-adapter';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { TranslateModule } from '@ngx-translate/core';
import 'hammerjs';
import { FuseModule } from '@fuse/fuse.module';
import { FuseSharedModule } from '@fuse/shared.module';

2
src/app/layout/components/footer/footer.component.html
View File

@ -6,7 +6,7 @@
target="_blank" mat-button class="pink" fxFlex="0 0 auto" fxLayout="row"
fxLayoutAlign="start center">
<mat-icon class="s-16 mr-sm-4">shopping_cart</mat-icon>
<span>Purchase FUSE (Angular 8+)</span>
<span>Purchase FUSE Angular</span>
</a>
<div fxLayout="row" fxLayoutAlign="start center" fxHide fxShow.gt-xs>

4
src/environments/environment.hmr.ts
View File

@ -1,4 +0,0 @@
export const environment = {
production: false,
hmr : true
};

4
src/index.html
View File

@ -3,13 +3,13 @@
<head>
<title>Fuse - Angular 8+ Material Design Admin Template</title>
<title>Fuse Angular - Material Design Admin Template</title>
<base href="/">
<meta charset="utf-8">
<meta name="description" content="Material design admin template with pre-built apps and pages">
<meta name="keywords"
content="HTML,CSS,AngularJS,Angular,Angular 2,Angular 4,Angular 5,Angular 6,Angular 7,Material,Material 2">
content="HTML,CSS,AngularJS,Angular,Angular 2,Angular 4,Angular 5,Angular 6,Angular 7,Angular 8,Angular 9,Angular 10,Material,Material 2">
<meta name="author" content="Withinpixels">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">

22
src/main.ts
View File

@ -1,30 +1,12 @@
import { enableProdMode } from '@angular/core';
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
import { AppModule } from './app/app.module';
import { environment } from './environments/environment';
import { hmrBootstrap } from 'hmr';
if ( environment.production )
{
enableProdMode();
}
const bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
if ( environment.hmr )
{
if ( module['hot'] )
{
hmrBootstrap(module, bootstrap);
}
else
{
console.error('HMR is not enabled for webpack-dev-server!');
console.log('Are you using the --hmr flag for ng serve?');
}
}
else
{
bootstrap().catch(err => console.error(err));
}
platformBrowserDynamic().bootstrapModule(AppModule)
.catch(err => console.error(err));

2
tsconfig.app.json
View File

@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": [

31
tsconfig.base.json Normal file
View File

@ -0,0 +1,31 @@
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./src",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "es2020",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"paths": {
"@fuse": [
"@fuse/"
]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": false,
"strictInjectionParameters": false
}
}

42
tsconfig.json
View File

@ -1,31 +1,17 @@
/*
This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
It is not intended to be used to perform a compilation.
To learn more about this file see: https://angular.io/config/solution-tsconfig.
*/
{
"compileOnSave": false,
"compilerOptions": {
"baseUrl": "./src",
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"importHelpers": true,
"target": "es2015",
"typeRoots": [
"node_modules/@types"
],
"lib": [
"es2018",
"dom"
],
"paths": {
"@fuse": [
"@fuse/"
"files": [],
"references": [
{
"path": "./tsconfig.app.json"
},
{
"path": "./tsconfig.spec.json"
}
]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": false,
"strictInjectionParameters": false
}
}

2
tsconfig.spec.json
View File

@ -1,5 +1,5 @@
{
"extends": "./tsconfig.json",
"extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [

57
tslint.json
View File

@ -1,8 +1,16 @@
{
"extends": "tslint:recommended",
"rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false,
"arrow-parens": false,
"arrow-return-shorthand": true,
"curly": true,
"deprecation": {
"severity": "warning"
},
@ -31,10 +39,17 @@
"camelCase"
]
],
"eofline": true,
"import-blacklist": [
true,
"rxjs/Rx"
],
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"interface-name": false,
"max-classes-per-file": false,
"max-line-length": [
@ -83,6 +98,20 @@
true,
"single"
],
"semicolon": {
"options": [
"always"
]
},
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"typedef": [
true,
"call-signature",
@ -99,6 +128,24 @@
"no-outputs-metadata-property": true,
"template-banana-in-box": true,
"template-no-negated-async": true,
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"use-lifecycle-interface": true,
"use-pipe-transform-interface": true,
"variable-name": [
@ -107,7 +154,17 @@
"check-format",
"allow-pascal-case",
"allow-leading-underscore"
],
"whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
}
},
"rulesDirectory": [
"codelyzer"