diff --git a/src/main/webapp/app/app.module.ts b/src/main/webapp/app/app.module.ts
index 0809527..c297822 100644
--- a/src/main/webapp/app/app.module.ts
+++ b/src/main/webapp/app/app.module.ts
@@ -26,7 +26,6 @@ import { MainComponent } from './layouts/main/main.component';
import { NavbarComponent } from './layouts/navbar/navbar.component';
import { FooterComponent } from './layouts/footer/footer.component';
import { PageRibbonComponent } from './layouts/profiles/page-ribbon.component';
-import { ActiveMenuDirective } from './layouts/navbar/active-menu.directive';
import { ErrorComponent } from './layouts/error/error.component';
import { SidebarComponent } from './layouts/sidebar/sidebar.component';
@@ -60,15 +59,7 @@ import { SidebarComponent } from './layouts/sidebar/sidebar.component';
{ provide: NgbDateAdapter, useClass: NgbDateDayjsAdapter },
httpInterceptorProviders,
],
- declarations: [
- MainComponent,
- NavbarComponent,
- ErrorComponent,
- PageRibbonComponent,
- ActiveMenuDirective,
- FooterComponent,
- SidebarComponent,
- ],
+ declarations: [MainComponent, NavbarComponent, ErrorComponent, PageRibbonComponent, FooterComponent, SidebarComponent],
bootstrap: [MainComponent],
})
export class AppModule {
diff --git a/src/main/webapp/app/layouts/main/main.component.html b/src/main/webapp/app/layouts/main/main.component.html
index 3ac9be9..cd18230 100644
--- a/src/main/webapp/app/layouts/main/main.component.html
+++ b/src/main/webapp/app/layouts/main/main.component.html
@@ -1,13 +1,21 @@
-
-
-
-
-
-
-
-
+
+
+
+
diff --git a/src/main/webapp/app/layouts/main/main.component.scss b/src/main/webapp/app/layouts/main/main.component.scss
new file mode 100644
index 0000000..98938a5
--- /dev/null
+++ b/src/main/webapp/app/layouts/main/main.component.scss
@@ -0,0 +1,4 @@
+.sidebar:after,
+.off-canvas-sidebar:after {
+ background: #0f172a;
+}
diff --git a/src/main/webapp/app/layouts/main/main.component.ts b/src/main/webapp/app/layouts/main/main.component.ts
index 714687f..bcae3de 100644
--- a/src/main/webapp/app/layouts/main/main.component.ts
+++ b/src/main/webapp/app/layouts/main/main.component.ts
@@ -9,6 +9,7 @@ import { AccountService } from 'app/core/auth/account.service';
@Component({
selector: 'jhi-main',
templateUrl: './main.component.html',
+ styleUrls: ['./main.component.scss'],
})
export class MainComponent implements OnInit {
private renderer: Renderer2;
@@ -55,4 +56,12 @@ export class MainComponent implements OnInit {
}
this.translateService.get(pageTitle).subscribe(title => this.titleService.setTitle(title));
}
+
+ isAdmin(): boolean {
+ return this.accountService.hasAnyAuthority('ROLE_ADMIN');
+ }
+
+ isAuthenticated(): boolean {
+ return this.accountService.isAuthenticated();
+ }
}
diff --git a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts b/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
deleted file mode 100644
index 6150841..0000000
--- a/src/main/webapp/app/layouts/navbar/active-menu.directive.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Directive, OnInit, ElementRef, Renderer2, Input } from '@angular/core';
-import { TranslateService, LangChangeEvent } from '@ngx-translate/core';
-
-@Directive({
- selector: '[jhiActiveMenu]',
-})
-export class ActiveMenuDirective implements OnInit {
- @Input() jhiActiveMenu?: string;
-
- constructor(private el: ElementRef, private renderer: Renderer2, private translateService: TranslateService) {}
-
- ngOnInit(): void {
- this.translateService.onLangChange.subscribe((event: LangChangeEvent) => {
- this.updateActiveFlag(event.lang);
- });
-
- this.updateActiveFlag(this.translateService.currentLang);
- }
-
- updateActiveFlag(selectedLanguage: string): void {
- if (this.jhiActiveMenu === selectedLanguage) {
- this.renderer.addClass(this.el.nativeElement, 'active');
- } else {
- this.renderer.removeClass(this.el.nativeElement, 'active');
- }
- }
-}
diff --git a/src/main/webapp/app/layouts/navbar/navbar.component.html b/src/main/webapp/app/layouts/navbar/navbar.component.html
index 48de3b3..2cf87c8 100644
--- a/src/main/webapp/app/layouts/navbar/navbar.component.html
+++ b/src/main/webapp/app/layouts/navbar/navbar.component.html
@@ -1,352 +1,74 @@
-