Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added packages/frontend/public/favicon.ico
Binary file not shown.
Binary file added packages/frontend/public/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion packages/frontend/src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,14 @@ export const metadata: Metadata = {
'survey tracking',
],
authors: [{ name: `${BRAND.name} Team` }],
icons: { icon: '/icon.svg' },
icons: {
icon: [
{ url: '/favicon.ico', sizes: 'any' },
{ url: '/favicon.png', type: 'image/png' },
{ url: '/icon.svg', type: 'image/svg+xml' },
],
shortcut: '/favicon.ico',
},
openGraph: {
title: getBrandText().pageTitles.admin,
description:
Expand Down
31 changes: 27 additions & 4 deletions packages/frontend/src/app/tasks/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
'use client';

import { useEffect, useState } from 'react';
import { useRouter } from 'next/navigation';
import Link from 'next/link';
import { usePathname, useRouter } from 'next/navigation';
import { ClipboardList } from 'lucide-react';
import { useAuthStore } from '@/stores/auth-store';
import { Navbar } from '@/components/navigation/navbar';

Expand All @@ -11,8 +13,12 @@ export default function TasksLayout({
children: React.ReactNode;
}) {
const router = useRouter();
const pathname = usePathname();
const { isAuthenticated, isLoading, fetchUser } = useAuthStore();
const [isValidating, setIsValidating] = useState(true);
// The dashboard index gets the sidebar app shell (mirroring the writer
// portal); detail/form pages keep the centered container.
const isDashboardRoute = pathname === '/tasks';

useEffect(() => {
// Always validate session on mount
Expand Down Expand Up @@ -55,9 +61,26 @@ export default function TasksLayout({
return (
<div className="min-h-screen bg-background">
<Navbar />
<main className="humanly-dashboard-page">
{children}
</main>
{isDashboardRoute ? (
<div className="flex min-h-[calc(100vh-73px)] w-full">
<aside className="hidden w-[236px] shrink-0 border-r border-border/55 px-4 py-7 lg:block xl:w-[252px]">
<nav className="sticky top-24 flex flex-col gap-1">
<Link
href="/tasks"
className="flex h-11 items-center gap-3 rounded-md bg-secondary px-3 text-sm font-medium"
>
<ClipboardList className="h-4 w-4" />
<span>Tasks</span>
</Link>
</nav>
</aside>
<main className="min-w-0 flex-1 px-5 py-7 sm:px-8 lg:px-10">
<div className="mx-auto w-full max-w-7xl">{children}</div>
</main>
</div>
) : (
<main className="humanly-dashboard-page">{children}</main>
)}
</div>
);
}
2 changes: 1 addition & 1 deletion packages/frontend/src/components/navigation/navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function Navbar() {
return (
<>
<nav className="bg-background">
<div className="mx-auto w-full max-w-7xl px-5 sm:px-8 lg:px-10">
<div className="w-full px-5 sm:px-8 lg:px-10">
<div className="flex h-16 items-center justify-between">
<div className="flex items-center">
<Link href="/tasks" className="flex items-center rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring">
Expand Down
Loading