-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #84 from szymonpoltorak/DEV-168-GoToProjectsButton
Dev 168 go to projects button
- Loading branch information
Showing
8 changed files
with
146 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
corn-frontend/src/app/shared/toolbar/toolbar.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <mat-toolbar color="primary"> | ||
| @if (!isOnProjectRoute) { | ||
| <div class="flex space-x-4 items-center"> | ||
| <button mat-icon-button (click)="toggleSidebar()"> | ||
| <mat-icon>{{ sidebarShown ? 'menu_open' : 'menu' }}</mat-icon> | ||
| </button> | ||
|
|
||
| <button mat-button [matMenuTriggerFor]="menu" #t="matMenuTrigger"> | ||
| Your Projects | ||
| <mat-icon iconPositionEnd>{{ t.menuOpen ? 'expand_less' : 'expand_more' }}</mat-icon> | ||
| </button> | ||
|
|
||
| <mat-menu #menu="matMenu"> | ||
| <button mat-menu-item>Some Project</button> | ||
| <button mat-menu-item>Another Project</button> | ||
| </mat-menu> | ||
| </div> | ||
| } | ||
|
|
||
| <span class="flex-auto"></span> | ||
|
|
||
| @if (!isOnProjectRoute) { | ||
| <button mat-icon-button | ||
| [routerLink]="RouterPaths.PROJECT_LIST_DIRECT_PATH" | ||
| class="center" | ||
| matTooltip="Go to projects" | ||
| aria-label="Go to projects"> | ||
| <mat-icon>apps</mat-icon> | ||
| </button> | ||
| } | ||
|
|
||
| @if (isLoggedIn && userProfile) { | ||
| <userinfo [username]="userProfile!.username || ''" | ||
| [fullName]="userProfile!.firstName + ' ' + userProfile!.lastName" | ||
| (logout)="logout()"> | ||
| </userinfo> | ||
| } | ||
| </mat-toolbar> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .center { | ||
| @apply flex items-center justify-center; | ||
| } |
23 changes: 23 additions & 0 deletions
23
corn-frontend/src/app/shared/toolbar/toolbar.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { ToolbarComponent } from './toolbar.component'; | ||
|
|
||
| describe('ToolbarComponent', () => { | ||
| let component: ToolbarComponent; | ||
| let fixture: ComponentFixture<ToolbarComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [ToolbarComponent] | ||
| }) | ||
| .compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(ToolbarComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; | ||
| import { MatButton, MatIconButton } from "@angular/material/button"; | ||
| import { MatIcon } from "@angular/material/icon"; | ||
| import { MatMenu, MatMenuItem, MatMenuTrigger } from "@angular/material/menu"; | ||
| import { MatToolbar } from "@angular/material/toolbar"; | ||
| import { KeycloakProfile } from "keycloak-js"; | ||
| import { UserinfoComponent } from "@pages/boards/userinfo/userinfo.component"; | ||
| import { KeycloakService } from "keycloak-angular"; | ||
| import { Router, RouterLink } from "@angular/router"; | ||
| import { RouterPaths } from "@core/enum/RouterPaths"; | ||
| import { MatTooltip } from "@angular/material/tooltip"; | ||
|
|
||
| @Component({ | ||
| selector: 'app-toolbar', | ||
| standalone: true, | ||
| imports: [ | ||
| MatButton, | ||
| MatIcon, | ||
| MatIconButton, | ||
| MatMenu, | ||
| MatMenuItem, | ||
| MatToolbar, | ||
| UserinfoComponent, | ||
| MatMenuTrigger, | ||
| MatTooltip, | ||
| RouterLink | ||
| ], | ||
| templateUrl: './toolbar.component.html', | ||
| styleUrl: './toolbar.component.scss' | ||
| }) | ||
| export class ToolbarComponent implements OnInit { | ||
| @Input() isOnProjectRoute: boolean = false; | ||
| userProfile ?: KeycloakProfile; | ||
| isLoggedIn: boolean = false; | ||
| @Output() sidebarEvent: EventEmitter<boolean> = new EventEmitter<boolean>(); | ||
| sidebarShown: boolean = true; | ||
|
|
||
| constructor(private keycloak: KeycloakService, | ||
| private router: Router) { | ||
| } | ||
|
|
||
| async ngOnInit(): Promise<void> { | ||
| this.isLoggedIn = this.keycloak.isLoggedIn(); | ||
|
|
||
| if (this.isLoggedIn) { | ||
| this.userProfile = await this.keycloak.loadUserProfile(); | ||
| console.log(this.userProfile); | ||
| } else { | ||
| this.router.navigate([RouterPaths.HOME_DIRECT_PATH]); | ||
| } | ||
| } | ||
|
|
||
| toggleSidebar(): void { | ||
| this.sidebarShown = !this.sidebarShown; | ||
|
|
||
| this.sidebarEvent.emit(this.sidebarShown); | ||
| } | ||
|
|
||
| logout(): void { | ||
| this.keycloak.logout(); | ||
| } | ||
|
|
||
| protected readonly RouterPaths = RouterPaths; | ||
| } |