-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Dev 160 project navigation #83
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3cd6f80
Added toolbar do different component
szymonpoltorak 7773d64
Cleaned code and added hiding menu button on toolbar
szymonpoltorak 3789d36
Added changes from DEV-164-DoubleScrollbarFix
szymonpoltorak 6f46a54
Merge branch 'devel' into DEV-160-ProjectNavigation
szymonpoltorak 384b48e
Added changes from devel
szymonpoltorak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
28 changes: 28 additions & 0 deletions
28
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,28 @@ | ||
| <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 (isLoggedIn && userProfile) { | ||
| <userinfo [username]="userProfile!.username || ''" | ||
| [fullName]="userProfile!.firstName + ' ' + userProfile!.lastName" | ||
| (logout)="logout()"> | ||
| </userinfo> | ||
| } | ||
| </mat-toolbar> |
Empty file.
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,59 @@ | ||
| 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 } from "@angular/router"; | ||
| import { RouterPaths } from "@core/enum/RouterPaths"; | ||
|
|
||
| @Component({ | ||
| selector: 'app-toolbar', | ||
| standalone: true, | ||
| imports: [ | ||
| MatButton, | ||
| MatIcon, | ||
| MatIconButton, | ||
| MatMenu, | ||
| MatMenuItem, | ||
| MatToolbar, | ||
| UserinfoComponent, | ||
| MatMenuTrigger | ||
| ], | ||
| 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(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typ