From 44c2361564de415e64de9a9013d967442866417a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=87etin?=
<69278826+cetincakiroglu@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:29:51 +0300
Subject: [PATCH] Code format
---
.vscode/extensions.json | 4 -
.vscode/launch.json | 20 -
.vscode/tasks.json | 42 --
angular.json | 192 ++++-----
package.json | 103 ++---
src/app.component.ts | 4 +-
src/app.config.ts | 2 +-
src/app.routes.ts | 2 +-
src/app/layout/core/app.configurator.ts | 8 +-
.../layout/core/app.floatingconfigurator.ts | 34 +-
src/app/layout/core/app.footer.ts | 4 +-
src/app/layout/core/app.menu.ts | 38 +-
src/app/layout/core/app.menuitem.ts | 108 ++---
src/app/layout/core/app.sidebar.ts | 11 +-
src/app/layout/core/app.topbar.ts | 12 +-
src/app/pages/auth/access.ts | 59 ++-
src/app/pages/auth/auth.routes.ts | 6 +-
src/app/pages/auth/error.ts | 53 ++-
src/app/pages/auth/login.ts | 122 +++---
src/app/pages/crud/crud.ts | 326 ++++++++-------
.../dashboard/components/bestsellingwidget.ts | 175 ++++----
.../components/notificationswidget.ts | 15 +-
.../dashboard/components/recentsaleswidget.ts | 20 +-
.../components/revenuestreamwidget.ts | 62 ++-
.../pages/dashboard/components/statswidget.ts | 98 ++---
src/app/pages/dashboard/dashboard.ts | 30 +-
src/app/pages/documentation/documentation.ts | 141 ++++---
src/app/pages/empty/empty.ts | 13 +-
.../landing/components/featureswidget.ts | 13 +-
.../pages/landing/components/footerwidget.ts | 124 +++---
.../pages/landing/components/herowidget.ts | 40 +-
.../landing/components/highlightswidget.ts | 78 ++--
src/app/pages/notfound/notfound.ts | 121 +++---
src/app/pages/service/icon.service.ts | 13 +-
src/app/pages/uikit/buttondemo.ts | 373 +++++++++---------
src/app/pages/uikit/chartdemo.ts | 137 +++----
src/app/pages/uikit/filedemo.ts | 6 +-
src/app/pages/uikit/formlayoutdemo.ts | 17 +-
src/app/pages/uikit/inputdemo.ts | 138 ++++---
src/app/pages/uikit/messagesdemo.ts | 14 +-
src/app/pages/uikit/panelsdemo.ts | 327 ++++++++-------
src/app/pages/uikit/treedemo.ts | 18 +-
src/app/pages/uikit/uikit.routes.ts | 2 +-
src/index.html | 26 +-
src/main.ts | 4 +-
tsconfig.app.json | 22 +-
tsconfig.json | 46 +--
tsconfig.spec.json | 20 +-
vercel.json | 16 +-
49 files changed, 1536 insertions(+), 1723 deletions(-)
delete mode 100644 .vscode/extensions.json
delete mode 100644 .vscode/launch.json
delete mode 100644 .vscode/tasks.json
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index 77b3745..0000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846
- "recommendations": ["angular.ng-template"]
-}
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 925af83..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
- "version": "0.2.0",
- "configurations": [
- {
- "name": "ng serve",
- "type": "chrome",
- "request": "launch",
- "preLaunchTask": "npm: start",
- "url": "http://localhost:4200/"
- },
- {
- "name": "ng test",
- "type": "chrome",
- "request": "launch",
- "preLaunchTask": "npm: test",
- "url": "http://localhost:9876/debug.html"
- }
- ]
-}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index a298b5b..0000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558
- "version": "2.0.0",
- "tasks": [
- {
- "type": "npm",
- "script": "start",
- "isBackground": true,
- "problemMatcher": {
- "owner": "typescript",
- "pattern": "$tsc",
- "background": {
- "activeOnStart": true,
- "beginsPattern": {
- "regexp": "(.*?)"
- },
- "endsPattern": {
- "regexp": "bundle generation complete"
- }
- }
- }
- },
- {
- "type": "npm",
- "script": "test",
- "isBackground": true,
- "problemMatcher": {
- "owner": "typescript",
- "pattern": "$tsc",
- "background": {
- "activeOnStart": true,
- "beginsPattern": {
- "regexp": "(.*?)"
- },
- "endsPattern": {
- "regexp": "bundle generation complete"
- }
- }
- }
- }
- ]
-}
diff --git a/angular.json b/angular.json
index 826298d..6874a9c 100644
--- a/angular.json
+++ b/angular.json
@@ -1,102 +1,102 @@
{
- "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
- "version": 1,
- "newProjectRoot": "projects",
- "projects": {
- "sakai-ng": {
- "projectType": "application",
- "schematics": {
- "@schematics/angular:component": {
- "style": "scss"
- }
- },
- "root": "",
- "sourceRoot": "src",
- "prefix": "app",
- "architect": {
- "build": {
- "builder": "@angular-devkit/build-angular:application",
- "options": {
- "outputPath": "dist/sakai-ng",
- "index": "src/index.html",
- "browser": "src/main.ts",
- "polyfills": [
- "zone.js"
- ],
- "tsConfig": "tsconfig.app.json",
- "inlineStyleLanguage": "scss",
- "assets": [
- {
- "glob": "**/*",
- "input": "public"
- }
- ],
- "styles": [
- "src/styles.scss"
- ],
- "scripts": []
- },
- "configurations": {
- "production": {
- "budgets": [
- {
- "type": "initial",
- "maximumWarning": "1mb",
- "maximumError": "5mb"
- },
- {
- "type": "anyComponentStyle",
- "maximumWarning": "2kb",
- "maximumError": "4kb"
+ "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+ "version": 1,
+ "newProjectRoot": "projects",
+ "projects": {
+ "sakai-ng": {
+ "projectType": "application",
+ "schematics": {
+ "@schematics/angular:component": {
+ "style": "scss"
}
- ],
- "outputHashing": "all"
},
- "development": {
- "optimization": false,
- "extractLicenses": false,
- "sourceMap": true
+ "root": "",
+ "sourceRoot": "src",
+ "prefix": "app",
+ "architect": {
+ "build": {
+ "builder": "@angular-devkit/build-angular:application",
+ "options": {
+ "outputPath": "dist/sakai-ng",
+ "index": "src/index.html",
+ "browser": "src/main.ts",
+ "polyfills": [
+ "zone.js"
+ ],
+ "tsConfig": "tsconfig.app.json",
+ "inlineStyleLanguage": "scss",
+ "assets": [
+ {
+ "glob": "**/*",
+ "input": "public"
+ }
+ ],
+ "styles": [
+ "src/styles.scss"
+ ],
+ "scripts": []
+ },
+ "configurations": {
+ "production": {
+ "budgets": [
+ {
+ "type": "initial",
+ "maximumWarning": "1mb",
+ "maximumError": "5mb"
+ },
+ {
+ "type": "anyComponentStyle",
+ "maximumWarning": "2kb",
+ "maximumError": "4kb"
+ }
+ ],
+ "outputHashing": "all"
+ },
+ "development": {
+ "optimization": false,
+ "extractLicenses": false,
+ "sourceMap": true
+ }
+ },
+ "defaultConfiguration": "production"
+ },
+ "serve": {
+ "builder": "@angular-devkit/build-angular:dev-server",
+ "configurations": {
+ "production": {
+ "buildTarget": "sakai-ng:build:production"
+ },
+ "development": {
+ "buildTarget": "sakai-ng:build:development"
+ }
+ },
+ "defaultConfiguration": "development"
+ },
+ "extract-i18n": {
+ "builder": "@angular-devkit/build-angular:extract-i18n"
+ },
+ "test": {
+ "builder": "@angular-devkit/build-angular:karma",
+ "options": {
+ "polyfills": [
+ "zone.js",
+ "zone.js/testing"
+ ],
+ "tsConfig": "tsconfig.spec.json",
+ "inlineStyleLanguage": "scss",
+ "assets": [
+ {
+ "glob": "**/*",
+ "input": "public"
+ }
+ ],
+ "styles": [
+ "src/styles.scss"
+ ],
+ "scripts": []
+ }
+ }
}
- },
- "defaultConfiguration": "production"
- },
- "serve": {
- "builder": "@angular-devkit/build-angular:dev-server",
- "configurations": {
- "production": {
- "buildTarget": "sakai-ng:build:production"
- },
- "development": {
- "buildTarget": "sakai-ng:build:development"
- }
- },
- "defaultConfiguration": "development"
- },
- "extract-i18n": {
- "builder": "@angular-devkit/build-angular:extract-i18n"
- },
- "test": {
- "builder": "@angular-devkit/build-angular:karma",
- "options": {
- "polyfills": [
- "zone.js",
- "zone.js/testing"
- ],
- "tsConfig": "tsconfig.spec.json",
- "inlineStyleLanguage": "scss",
- "assets": [
- {
- "glob": "**/*",
- "input": "public"
- }
- ],
- "styles": [
- "src/styles.scss"
- ],
- "scripts": []
- }
}
- }
}
- }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 85bddd8..017ef6f 100644
--- a/package.json
+++ b/package.json
@@ -1,53 +1,54 @@
{
- "name": "sakai-ng",
- "version": "19.0.0",
- "scripts": {
- "ng": "ng",
- "start": "ng serve",
- "build": "ng build",
- "watch": "ng build --watch --configuration development",
- "test": "ng test"
- },
- "private": true,
- "dependencies": {
- "@angular/animations": "^19.0.0",
- "@angular/common": "^19.0.0",
- "@angular/compiler": "^19.0.0",
- "@angular/core": "^19.0.0",
- "@angular/forms": "^19.0.0",
- "@angular/platform-browser": "^19.0.0",
- "@angular/platform-browser-dynamic": "^19.0.0",
- "@angular/router": "^19.0.0",
- "@primeng/themes": "^19.0.2",
- "chart.js": "4.4.2",
- "primeclt": "^0.1.5",
- "primeicons": "^7.0.0",
- "primeng": "^19.0.2",
- "rxjs": "~7.8.0",
- "tailwindcss-primeui": "^0.3.2",
- "tslib": "^2.3.0",
- "zone.js": "~0.15.0"
- },
- "devDependencies": {
- "@angular-devkit/build-angular": "^19.0.6",
- "@angular/cli": "^19.0.6",
- "@angular/compiler-cli": "^19.0.0",
- "@types/jasmine": "~5.1.0",
- "autoprefixer": "^10.4.20",
- "eslint": "^9.14.0",
- "eslint-config-prettier": "^9.1.0",
- "eslint-plugin-import": "^2.31.0",
- "eslint-plugin-prefer-arrow": "^1.2.3",
- "eslint-plugin-prettier": "^4.2.1",
- "jasmine-core": "~5.4.0",
- "karma": "~6.4.0",
- "karma-chrome-launcher": "~3.2.0",
- "karma-coverage": "~2.2.0",
- "karma-jasmine": "~5.1.0",
- "karma-jasmine-html-reporter": "~2.1.0",
- "postcss": "^8.4.49",
- "prettier": "^3.0.0",
- "tailwindcss": "^3.4.17",
- "typescript": "~5.6.2"
- }
+ "name": "sakai-ng",
+ "version": "19.0.0",
+ "scripts": {
+ "ng": "ng",
+ "start": "ng serve",
+ "build": "ng build",
+ "watch": "ng build --watch --configuration development",
+ "format": "prettier --write \"**/*.{js,mjs,ts,mts,d.ts,html}\" --cache",
+ "test": "ng test"
+ },
+ "private": true,
+ "dependencies": {
+ "@angular/animations": "^19.0.0",
+ "@angular/common": "^19.0.0",
+ "@angular/compiler": "^19.0.0",
+ "@angular/core": "^19.0.0",
+ "@angular/forms": "^19.0.0",
+ "@angular/platform-browser": "^19.0.0",
+ "@angular/platform-browser-dynamic": "^19.0.0",
+ "@angular/router": "^19.0.0",
+ "@primeng/themes": "^19.0.2",
+ "chart.js": "4.4.2",
+ "primeclt": "^0.1.5",
+ "primeicons": "^7.0.0",
+ "primeng": "^19.0.2",
+ "rxjs": "~7.8.0",
+ "tailwindcss-primeui": "^0.3.2",
+ "tslib": "^2.3.0",
+ "zone.js": "~0.15.0"
+ },
+ "devDependencies": {
+ "@angular-devkit/build-angular": "^19.0.6",
+ "@angular/cli": "^19.0.6",
+ "@angular/compiler-cli": "^19.0.0",
+ "@types/jasmine": "~5.1.0",
+ "autoprefixer": "^10.4.20",
+ "eslint": "^9.14.0",
+ "eslint-config-prettier": "^9.1.0",
+ "eslint-plugin-import": "^2.31.0",
+ "eslint-plugin-prefer-arrow": "^1.2.3",
+ "eslint-plugin-prettier": "^4.2.1",
+ "jasmine-core": "~5.4.0",
+ "karma": "~6.4.0",
+ "karma-chrome-launcher": "~3.2.0",
+ "karma-coverage": "~2.2.0",
+ "karma-jasmine": "~5.1.0",
+ "karma-jasmine-html-reporter": "~2.1.0",
+ "postcss": "^8.4.49",
+ "prettier": "^3.0.0",
+ "tailwindcss": "^3.4.17",
+ "typescript": "~5.6.2"
+ }
}
diff --git a/src/app.component.ts b/src/app.component.ts
index 88170e8..e124abf 100644
--- a/src/app.component.ts
+++ b/src/app.component.ts
@@ -1,10 +1,10 @@
import { Component } from '@angular/core';
-import {RouterModule} from '@angular/router';
+import { RouterModule } from '@angular/router';
@Component({
selector: 'app-root',
standalone: true,
imports: [RouterModule],
- template:``,
+ template: ``
})
export class AppComponent {}
diff --git a/src/app.config.ts b/src/app.config.ts
index 28f3188..98c7523 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -11,6 +11,6 @@ export const appConfig: ApplicationConfig = {
provideRouter(appRoutes, withInMemoryScrolling({ anchorScrolling: 'enabled', scrollPositionRestoration: 'enabled' }), withEnabledBlockingInitialNavigation()),
provideHttpClient(withFetch()),
provideAnimationsAsync(),
- providePrimeNG({ theme: {preset: Aura, options: { darkModeSelector: '.app-dark'}}, ripple: false, inputStyle: 'outlined' })
+ providePrimeNG({ theme: { preset: Aura, options: { darkModeSelector: '.app-dark' } }, ripple: false, inputStyle: 'outlined' })
]
};
diff --git a/src/app.routes.ts b/src/app.routes.ts
index adb32ec..041c2ea 100644
--- a/src/app.routes.ts
+++ b/src/app.routes.ts
@@ -19,5 +19,5 @@ export const appRoutes: Routes = [
{ path: 'landing', component: Landing },
{ path: 'notfound', component: Notfound },
{ path: 'auth', loadChildren: () => import('./app/pages/auth/auth.routes') },
- { path: '**', redirectTo: '/notfound' },
+ { path: '**', redirectTo: '/notfound' }
];
diff --git a/src/app/layout/core/app.configurator.ts b/src/app/layout/core/app.configurator.ts
index cf90bd7..770f72b 100644
--- a/src/app/layout/core/app.configurator.ts
+++ b/src/app/layout/core/app.configurator.ts
@@ -2,13 +2,13 @@ import { CommonModule, isPlatformBrowser } from '@angular/common';
import { Component, computed, inject, PLATFORM_ID } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { $t, updatePreset, updateSurfacePalette } from '@primeng/themes';
-import Aura from '@primeng/themes/aura';
-import Lara from '@primeng/themes/lara';
-import Material from '@primeng/themes/material';
-import Nora from '@primeng/themes/nora';
import { PrimeNG } from 'primeng/config';
import { SelectButtonModule } from 'primeng/selectbutton';
import { LayoutService } from '../service/layout.service';
+import Aura from '@primeng/themes/aura';
+import Material from '@primeng/themes/material';
+import Lara from '@primeng/themes/lara';
+import Nora from '@primeng/themes/nora';
const presets = {
Aura,
diff --git a/src/app/layout/core/app.floatingconfigurator.ts b/src/app/layout/core/app.floatingconfigurator.ts
index f06fb0c..a7cf963 100644
--- a/src/app/layout/core/app.floatingconfigurator.ts
+++ b/src/app/layout/core/app.floatingconfigurator.ts
@@ -2,30 +2,20 @@ import { Component, computed, inject } from '@angular/core';
import { ButtonModule } from 'primeng/button';
import { StyleClassModule } from 'primeng/styleclass';
import { AppConfigurator } from './app.configurator';
-import { LayoutService} from '../service/layout.service';
+import { LayoutService } from '../service/layout.service';
@Component({
- selector: 'app-floating-configurator',
- imports: [ButtonModule, StyleClassModule, AppConfigurator],
- template: `
-
- `,
+ selector: 'app-floating-configurator',
+ imports: [ButtonModule, StyleClassModule, AppConfigurator],
+ template: `
+
+ `
})
export class AppFloatingConfigurator {
LayoutService = inject(LayoutService);
diff --git a/src/app/layout/core/app.footer.ts b/src/app/layout/core/app.footer.ts
index 6b70676..5548818 100644
--- a/src/app/layout/core/app.footer.ts
+++ b/src/app/layout/core/app.footer.ts
@@ -1,11 +1,11 @@
import { Component } from '@angular/core';
@Component({
- standalone:true,
+ standalone: true,
selector: 'app-footer',
template: ``,
+ `
})
export class AppFooter {}
diff --git a/src/app/layout/core/app.menu.ts b/src/app/layout/core/app.menu.ts
index 61324b3..ae77ce7 100644
--- a/src/app/layout/core/app.menu.ts
+++ b/src/app/layout/core/app.menu.ts
@@ -6,22 +6,16 @@ import { AppMenuitem } from './app.menuitem';
@Component({
selector: 'app-menu',
- standalone:true,
- imports: [
- CommonModule,
- AppMenuitem,
- RouterModule
- ],
+ standalone: true,
+ imports: [CommonModule, AppMenuitem, RouterModule],
template: `
- `,
+ `
})
export class AppMenu {
-
model: MenuItem[] = [];
ngOnInit() {
@@ -35,19 +29,19 @@ export class AppMenu {
items: [
{ label: 'Form Layout', icon: 'pi pi-fw pi-id-card', routerLink: ['/uikit/formlayout'] },
{ label: 'Input', icon: 'pi pi-fw pi-check-square', routerLink: ['/uikit/input'] },
- { label: 'Button', icon: 'pi pi-fw pi-mobile', class: 'rotated-icon', routerLink: ['/uikit/button'] },
- { label: 'Table', icon: 'pi pi-fw pi-table', routerLink: ['/uikit/table'] },
- { label: 'List', icon: 'pi pi-fw pi-list', routerLink: ['/uikit/list'] },
+ { label: 'Button', icon: 'pi pi-fw pi-mobile', class: 'rotated-icon', routerLink: ['/uikit/button'] },
+ { label: 'Table', icon: 'pi pi-fw pi-table', routerLink: ['/uikit/table'] },
+ { label: 'List', icon: 'pi pi-fw pi-list', routerLink: ['/uikit/list'] },
{ label: 'Tree', icon: 'pi pi-fw pi-share-alt', routerLink: ['/uikit/tree'] },
- { label: 'Panel', icon: 'pi pi-fw pi-tablet', routerLink: ['/uikit/panel'] },
- { label: 'Overlay', icon: 'pi pi-fw pi-clone', routerLink: ['/uikit/overlay'] },
- { label: 'Media', icon: 'pi pi-fw pi-image', routerLink: ['/uikit/media'] },
- { label: 'Menu', icon: 'pi pi-fw pi-bars', routerLink: ['/uikit/menu'] },
- { label: 'Message', icon: 'pi pi-fw pi-comment', routerLink: ['/uikit/message'] },
- { label: 'File', icon: 'pi pi-fw pi-file', routerLink: ['/uikit/file'] },
- { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', routerLink: ['/uikit/charts'] },
- { label: 'Timeline', icon: 'pi pi-fw pi-calendar', routerLink: ['/uikit/timeline'] },
- { label: 'Misc', icon: 'pi pi-fw pi-circle', routerLink: ['/uikit/misc'] }
+ { label: 'Panel', icon: 'pi pi-fw pi-tablet', routerLink: ['/uikit/panel'] },
+ { label: 'Overlay', icon: 'pi pi-fw pi-clone', routerLink: ['/uikit/overlay'] },
+ { label: 'Media', icon: 'pi pi-fw pi-image', routerLink: ['/uikit/media'] },
+ { label: 'Menu', icon: 'pi pi-fw pi-bars', routerLink: ['/uikit/menu'] },
+ { label: 'Message', icon: 'pi pi-fw pi-comment', routerLink: ['/uikit/message'] },
+ { label: 'File', icon: 'pi pi-fw pi-file', routerLink: ['/uikit/file'] },
+ { label: 'Chart', icon: 'pi pi-fw pi-chart-bar', routerLink: ['/uikit/charts'] },
+ { label: 'Timeline', icon: 'pi pi-fw pi-calendar', routerLink: ['/uikit/timeline'] },
+ { label: 'Misc', icon: 'pi pi-fw pi-circle', routerLink: ['/uikit/misc'] }
]
},
{
diff --git a/src/app/layout/core/app.menuitem.ts b/src/app/layout/core/app.menuitem.ts
index f770224..3b70b84 100644
--- a/src/app/layout/core/app.menuitem.ts
+++ b/src/app/layout/core/app.menuitem.ts
@@ -5,7 +5,7 @@ import { Subscription } from 'rxjs';
import { filter } from 'rxjs/operators';
import { CommonModule } from '@angular/common';
import { RippleModule } from 'primeng/ripple';
-import { MenuItem} from 'primeng/api';
+import { MenuItem } from 'primeng/api';
import { LayoutService } from '../service/layout.service';
@Component({
@@ -13,46 +13,63 @@ import { LayoutService } from '../service/layout.service';
selector: '[app-menuitem]',
imports: [CommonModule, RouterModule, RippleModule],
template: `
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
`,
animations: [
trigger('children', [
- state('collapsed', style({
- height: '0'
- })),
- state('expanded', style({
- height: '*'
- })),
+ state(
+ 'collapsed',
+ style({
+ height: '0'
+ })
+ ),
+ state(
+ 'expanded',
+ style({
+ height: '*'
+ })
+ ),
transition('collapsed <=> expanded', animate('400ms cubic-bezier(0.86, 0, 0.07, 1)'))
])
],
- providers: [LayoutService],
+ providers: [LayoutService]
})
export class AppMenuitem {
-
@Input() item!: MenuItem;
@Input() index!: number;
@@ -67,15 +84,17 @@ export class AppMenuitem {
menuResetSubscription: Subscription;
- key: string = "";
+ key: string = '';
- constructor(public router: Router, private layoutService: LayoutService) {
- this.menuSourceSubscription = this.layoutService.menuSource$.subscribe(value => {
+ constructor(
+ public router: Router,
+ private layoutService: LayoutService
+ ) {
+ this.menuSourceSubscription = this.layoutService.menuSource$.subscribe((value) => {
Promise.resolve(null).then(() => {
if (value.routeEvent) {
- this.active = (value.key === this.key || value.key.startsWith(this.key + '-')) ? true : false;
- }
- else {
+ this.active = value.key === this.key || value.key.startsWith(this.key + '-') ? true : false;
+ } else {
if (value.key !== this.key && !value.key.startsWith(this.key + '-')) {
this.active = false;
}
@@ -87,12 +106,11 @@ export class AppMenuitem {
this.active = false;
});
- this.router.events.pipe(filter(event => event instanceof NavigationEnd))
- .subscribe(params => {
- if (this.item.routerLink) {
- this.updateActiveStateFromRoute();
- }
- });
+ this.router.events.pipe(filter((event) => event instanceof NavigationEnd)).subscribe((params) => {
+ if (this.item.routerLink) {
+ this.updateActiveStateFromRoute();
+ }
+ });
}
ngOnInit() {
@@ -132,7 +150,7 @@ export class AppMenuitem {
}
get submenuAnimation() {
- return this.root ? 'expanded' : (this.active ? 'expanded' : 'collapsed');
+ return this.root ? 'expanded' : this.active ? 'expanded' : 'collapsed';
}
@HostBinding('class.active-menuitem')
diff --git a/src/app/layout/core/app.sidebar.ts b/src/app/layout/core/app.sidebar.ts
index 87c41f8..0aba02f 100644
--- a/src/app/layout/core/app.sidebar.ts
+++ b/src/app/layout/core/app.sidebar.ts
@@ -3,14 +3,11 @@ import { AppMenu } from './app.menu';
@Component({
selector: 'app-sidebar',
- standalone:true,
- imports: [
- AppMenu
- ],
- template: `
- `
})
export class AppSidebar {
constructor(public el: ElementRef) {}
diff --git a/src/app/layout/core/app.topbar.ts b/src/app/layout/core/app.topbar.ts
index 32d1617..ccbd633 100644
--- a/src/app/layout/core/app.topbar.ts
+++ b/src/app/layout/core/app.topbar.ts
@@ -58,15 +58,7 @@ import { LayoutService } from '../service/layout.service';
-