diff --git a/src/@fuse/components/navigation/vertical/item/item.component.html b/src/@fuse/components/navigation/vertical/item/item.component.html
index 75101981..d0ad9767 100644
--- a/src/@fuse/components/navigation/vertical/item/item.component.html
+++ b/src/@fuse/components/navigation/vertical/item/item.component.html
@@ -38,10 +38,10 @@
{{item.icon}}
- {{(item.translate | translate) || item.title}}
+ {{item.title}}
- {{(item.badge.translate | translate) || item.badge.title}}
+ {{item.badge.title}}
diff --git a/src/@fuse/components/search-bar/search-bar.component.scss b/src/@fuse/components/search-bar/search-bar.component.scss
index f844c772..493261d5 100644
--- a/src/@fuse/components/search-bar/search-bar.component.scss
+++ b/src/@fuse/components/search-bar/search-bar.component.scss
@@ -74,7 +74,7 @@
}
.fuse-search-bar-collapser {
- display: flex;
+ display: inline-block;
}
}
}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 9de91834..1b49411c 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -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');
+ * });
*/
/**
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 95d3ff28..26acc25a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -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';
diff --git a/src/app/layout/components/footer/footer.component.html b/src/app/layout/components/footer/footer.component.html
index 0509d785..b40f5dd9 100644
--- a/src/app/layout/components/footer/footer.component.html
+++ b/src/app/layout/components/footer/footer.component.html
@@ -6,7 +6,7 @@
target="_blank" mat-button class="pink" fxFlex="0 0 auto" fxLayout="row"
fxLayoutAlign="start center">
shopping_cart
-
Purchase FUSE (Angular 8+)
+
Purchase FUSE Angular
diff --git a/src/environments/environment.hmr.ts b/src/environments/environment.hmr.ts
deleted file mode 100644
index b129af6b..00000000
--- a/src/environments/environment.hmr.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export const environment = {
- production: false,
- hmr : true
-};
diff --git a/src/index.html b/src/index.html
index bf0b20e5..50524003 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,13 +3,13 @@
-
Fuse - Angular 8+ Material Design Admin Template
+ Fuse Angular - Material Design Admin Template
+ content="HTML,CSS,AngularJS,Angular,Angular 2,Angular 4,Angular 5,Angular 6,Angular 7,Angular 8,Angular 9,Angular 10,Material,Material 2">
diff --git a/src/main.ts b/src/main.ts
index 205fa71c..46b5ace9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -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));
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 5888445b..c3bc6d38 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,15 +1,15 @@
{
- "extends": "./tsconfig.json",
+ "extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/app",
"types": [
"node"
]
},
- "files": [
- "src/main.ts",
- "src/polyfills.ts"
- ],
+ "files": [
+ "src/main.ts",
+ "src/polyfills.ts"
+ ],
"include": [
"src/**/*.d.ts"
]
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000..f2b531c2
--- /dev/null
+++ b/tsconfig.base.json
@@ -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
+ }
+}
diff --git a/tsconfig.json b/tsconfig.json
index 7bdabc60..25d44550 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -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
- }
+ ]
}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index f3d7d222..cab4827e 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -1,5 +1,5 @@
{
- "extends": "./tsconfig.json",
+ "extends": "./tsconfig.base.json",
"compilerOptions": {
"outDir": "./out-tsc/spec",
"types": [
diff --git a/tslint.json b/tslint.json
index b528a0d6..60c36937 100644
--- a/tslint.json
+++ b/tslint.json
@@ -1,10 +1,18 @@
{
"extends": "tslint:recommended",
"rules": {
+ "align": {
+ "options": [
+ "parameters",
+ "statements"
+ ]
+ },
"array-type": false,
"arrow-parens": false,
+ "arrow-return-shorthand": true,
+ "curly": true,
"deprecation": {
- "severity": "warning"
+ "severity": "warning"
},
"component-class-suffix": true,
"contextual-lifecycle": true,
@@ -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"