-
Notifications
You must be signed in to change notification settings - Fork 352
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: remove flex-layout from home page
- Loading branch information
1 parent
45df636
commit 6884ae5
Showing
15 changed files
with
353 additions
and
319 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,85 +1,79 @@ | ||
| @if (showHeader) { | ||
| <mat-toolbar | ||
| [ngClass]="{ inbox: globalState.isInboxState }" | ||
| class="flex items-center justify-start" | ||
| style="min-height: 85px" | ||
| > | ||
| @if (!media.isActive('xs')) { | ||
| <a uiSref="home" class="pt-4"> | ||
| <mat-icon | ||
| uiSref="home" | ||
| style="margin-right: 20px; margin-left: 20px" | ||
| svgIcon="formatif-logo" | ||
| class="formatif-icon" | ||
| aria-label="Formatif logo" | ||
| ></mat-icon> | ||
| </a> | ||
| } | ||
| <mat-toolbar class="flex items-center justify-start" style="min-height: 85px"> | ||
| @if (true) { | ||
| <a uiSref="home" class="pt-4"> | ||
| <mat-icon | ||
| uiSref="home" | ||
| style="margin-right: 20px; margin-left: 20px" | ||
| svgIcon="formatif-logo" | ||
| class="formatif-icon" | ||
| aria-label="Formatif logo" | ||
| ></mat-icon> | ||
| </a> | ||
| } | ||
|
|
||
| <unit-dropdown [unit]="currentUnit" [unitRoles]="filteredUnitRoles" [projects]="projects" class="mr-2"> | ||
| </unit-dropdown> | ||
| <unit-dropdown | ||
| [unit]="currentUnit" | ||
| [unitRoles]="filteredUnitRoles" | ||
| [projects]="projects" | ||
| class="mr-2" | ||
| > | ||
| </unit-dropdown> | ||
|
|
||
| <task-dropdown | ||
| [currentUnit]="currentUnit" | ||
| [currentProject]="currentProject" | ||
| [currentView]="currentView" | ||
| [data]="data" | ||
| [unitRole]="currentUnitRole" | ||
| ></task-dropdown> | ||
| <task-dropdown | ||
| [currentUnit]="currentUnit" | ||
| [currentProject]="currentProject" | ||
| [currentView]="currentView" | ||
| [data]="data" | ||
| [unitRole]="currentUnitRole" | ||
| ></task-dropdown> | ||
|
|
||
| <span class="grow"></span> | ||
| <span class="grow"></span> | ||
|
|
||
| @if (currentUser.role === 'Admin' || currentUser.role === 'Convenor') { | ||
| <button | ||
| #menuState="matMenuTrigger" | ||
| mat-icon-button | ||
| fxShow.lt-sm="false" | ||
| fxShow.gt-md="true" | ||
| fxShow="true" | ||
| [matMenuTriggerFor]="menu" | ||
| > | ||
| <mat-icon>admin_panel_settings</mat-icon> | ||
| </button> | ||
| } | ||
| <mat-menu #menu="matMenu"> | ||
| @if (currentUser.role === 'Admin') { | ||
| <button mat-menu-item uiSref="institutionsettings"> | ||
| <mat-icon matListItemIcon>business</mat-icon> | ||
| Institution Settings | ||
| </button> | ||
| } | ||
| <button mat-menu-item uiSref="admin/units"> | ||
| <mat-icon matListItemIcon>school</mat-icon> | ||
| Manage Units | ||
| </button> | ||
| @if (currentUser.role === 'Admin') { | ||
| <button mat-menu-item uiSref="admin/users"> | ||
| <mat-icon matListItemIcon>people</mat-icon> | ||
| Manage Users | ||
| </button> | ||
| @if (currentUser.role === 'Admin' || currentUser.role === 'Convenor') { | ||
| <button #menuState="matMenuTrigger" mat-icon-button [matMenuTriggerFor]="menu"> | ||
| <mat-icon>admin_panel_settings</mat-icon> | ||
| </button> | ||
| } | ||
| </mat-menu> | ||
| <mat-menu #menu="matMenu"> | ||
| @if (currentUser.role === 'Admin') { | ||
| <button mat-menu-item uiSref="institutionsettings"> | ||
| <mat-icon matListItemIcon>business</mat-icon> | ||
| Institution Settings | ||
| </button> | ||
| } | ||
| <button mat-menu-item uiSref="admin/units"> | ||
| <mat-icon matListItemIcon>school</mat-icon> | ||
| Manage Units | ||
| </button> | ||
| @if (currentUser.role === 'Admin') { | ||
| <button mat-menu-item uiSref="admin/users"> | ||
| <mat-icon matListItemIcon>people</mat-icon> | ||
| Manage Users | ||
| </button> | ||
| } | ||
| </mat-menu> | ||
|
|
||
| <button mat-button [matMenuTriggerFor]="menu2"> | ||
| <user-icon [size]="32"></user-icon> | ||
| </button> | ||
| <mat-menu #menu2="matMenu"> | ||
| <button mat-menu-item uiSref="edit_profile"> | ||
| <mat-icon matListItemIcon aria-label="Edit profile">person</mat-icon> | ||
| Edit Profile | ||
| </button> | ||
| <button mat-menu-item (click)="openCalendar()"> | ||
| <mat-icon matListItemIcon aria-label="Edit calendar">calendar_month</mat-icon> | ||
| Calendar | ||
| </button> | ||
| <button mat-menu-item (click)="openAboutModal()"> | ||
| <mat-icon matListItemIcon aria-label="About">info</mat-icon> | ||
| About | ||
| </button> | ||
| <button mat-menu-item (click)="signOut()"> | ||
| <mat-icon matListItemIcon aria-label="Sign out">logout</mat-icon> | ||
| Sign Out | ||
| <button mat-button [matMenuTriggerFor]="menu2"> | ||
| <user-icon [size]="32"></user-icon> | ||
| </button> | ||
| </mat-menu> | ||
| </mat-toolbar> | ||
| <mat-menu #menu2="matMenu"> | ||
| <button mat-menu-item uiSref="edit_profile"> | ||
| <mat-icon matListItemIcon aria-label="Edit profile">person</mat-icon> | ||
| Edit Profile | ||
| </button> | ||
| <button mat-menu-item (click)="openCalendar()"> | ||
| <mat-icon matListItemIcon aria-label="Edit calendar">calendar_month</mat-icon> | ||
| Calendar | ||
| </button> | ||
| <button mat-menu-item (click)="openAboutModal()"> | ||
| <mat-icon matListItemIcon aria-label="About">info</mat-icon> | ||
| About | ||
| </button> | ||
| <button mat-menu-item (click)="signOut()"> | ||
| <mat-icon matListItemIcon aria-label="Sign out">logout</mat-icon> | ||
| Sign Out | ||
| </button> | ||
| </mat-menu> | ||
| </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
Oops, something went wrong.