Skip to content

rebase #117

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.

Sign up for GitHub

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

Merged
kevbang merged 3 commits into from
Mar 7, 2026
Merged

rebase #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eb8ff5
fix: redirect employee to tasks page and remove home page
rrrockey Mar 6, 2026
dbc6fe2
chore: remove old employee dashboard
rrrockey Mar 6, 2026
ae42849
Merge pull request #116 from Culinary-Command/fix/employee-dashboard-fix
rrrockey Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CulinaryCommandApp/Components/Layout/Home.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,13 @@
var ctx = await UserCtx.GetAsync();
if (ctx.User?.Id != null)
{
Nav.NavigateTo("/dashboard", forceLoad: true);
if (ctx.User?.Role == "Employee") {
Nav.NavigateTo("/tasks");
}
else {
Console.WriteLine("DEBUG: dashboard nav. Role: " + ctx.User?.Role);
Nav.NavigateTo("/dashboard", forceLoad: true);
}
}
}
}
75 changes: 31 additions & 44 deletions CulinaryCommandApp/Components/Layout/NavMenu.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,80 +20,67 @@

<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="/dashboard" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill nav-icon" aria-hidden="true"></span> Home
</NavLink>
</div>


<div class="nav-item px-3">
<NavLink class="nav-link" href="/dashboard">
<span class="bi bi-speedometer2 nav-icon" aria-hidden="true"></span> Dashboard
</NavLink>
</div>

<div class="nav-item px-3">
<NavLink class="nav-link" href="/tasks">
<span class="bi bi-list-nested nav-icon" aria-hidden="true"></span> My Tasks
</NavLink>
</div>

<div class="nav-item px-3">
<a class="nav-link @(Nav.Uri.Contains("/inventory-management") ? "active" : "")"
href="#" @onclick="async () => await GoToInventory()" @onclick:preventDefault="true">
<span class="bi bi-box-seam nav-icon" aria-hidden="true"></span> Inventory
</a>
</div>

@if (_role == "Admin")
@if (_role == "Employee")
{
<div class="nav-item px-3">
<NavLink class="nav-link" href="recipes">
<span class="bi bi-journal-text nav-icon"></span> Recipes
<NavLink class="nav-link" href="/tasks">
<span class="bi bi-list-nested nav-icon" aria-hidden="true"></span> My Tasks
</NavLink>
</div>
}
else if (_role == "Admin")
{
@* ADMIN ONLY *@
}
@if (_role == "Admin" || _role == "Manager")
{
@* NON EMPLOYEE *@
<div class="nav-item px-3">
<NavLink class="nav-link" href="/assign-tasks">
<span class="bi bi-clipboard-check nav-icon" aria-hidden="true"></span> Assign Tasks
<NavLink class="nav-link" href="/dashboard">
<span class="bi bi-speedometer2 nav-icon" aria-hidden="true"></span> Dashboard
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="/purchase-orders">
<span class="bi bi-cart3 nav-icon" aria-hidden="true"></span> Purchase Orders
<NavLink class="nav-link" href="/assign-tasks">
<span class="bi bi-clipboard-check nav-icon" aria-hidden="true"></span> Assign Tasks
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="users">
<span class="bi bi-people nav-icon"></span> Manage Users
<NavLink class="nav-link" href="/inventory-catalog">
<span class="bi bi-card-list nav-icon" aria-hidden="true"></span> Inventory Catalog
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="margin-edge">
<span class="bi bi-terminal nav-icon"></span> MarginEdge
</NavLink>
<a class="nav-link @(Nav.Uri.Contains("/inventory-management") ? "active" : "")"
href="#" @onclick="async () => await GoToInventory()" @onclick:preventDefault="true">
<span class="bi bi-box-seam nav-icon" aria-hidden="true"></span> Inventory
</a>
</div>
}
else if (_role == "Manager")
{
<div class="nav-item px-3">
<NavLink class="nav-link" href="recipes">
<span class="bi bi-journal-text nav-icon"></span> Recipes
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="/inventory-catalog">
<span class="bi bi-card-list nav-icon" aria-hidden="true"></span> Inventory Catalog
<NavLink class="nav-link" href="users">
<span class="bi bi-people nav-icon"></span> Manage Users
</NavLink>
</div>

</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="/purchase-orders">
<span class="bi bi-cart3 nav-icon" aria-hidden="true"></span> Purchase Orders
</NavLink>
</div>


}
@* all users have access for now *@
<div class="nav-item px-3">
<NavLink class="nav-link" href="margin-edge">
<span class="bi bi-terminal nav-icon"></span> MarginEdge
</NavLink>
</div>
</nav>
</div>

Expand Down
35 changes: 0 additions & 35 deletions CulinaryCommandApp/Components/Pages/EmployeeView.razor
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion CulinaryCommandApp/Components/Pages/PostLogin.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,13 @@
// JS-safe now (we're in OnAfterRender)
await LocationState.SetLocationsAsync(ctx.AccessibleLocations);

var target = (ctx.AccessibleLocations?.Any() == true) ? "/dashboard" : "/onboarding";
var target = (ctx.AccessibleLocations?.Any() == false) ? "/onboarding" : "/dashboard";
if (target == "/dashboard") {
if (ctx.User?.Role == "Employee") {
target = "/tasks";
}
}


status = $"Redirecting to {target}…";
StateHasChanged();
Expand Down
Loading