refactor: move notifications to popover and simplify task timeline
This commit is contained in:
@@ -8,7 +8,6 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation';
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { authClient } from '@/lib/auth-client';
|
||||
import { TaskDetailModal } from '@/components/notifications/task-detail-modal';
|
||||
import { TaskNotificationsDrawer } from '@/components/notifications/task-notifications-drawer';
|
||||
import { TaskNotificationsTrigger } from '@/components/notifications/task-notifications-trigger';
|
||||
import {
|
||||
companyAnalysisQueryOptions,
|
||||
@@ -422,7 +421,23 @@ export function AppShell({ title, subtitle, actions, activeTicker, breadcrumbs,
|
||||
</aside>
|
||||
|
||||
<div className="min-w-0 flex-1 pb-24 lg:pb-0">
|
||||
<header className="mb-4 rounded-2xl border border-[color:var(--line-weak)] bg-[color:var(--panel)] px-6 py-5 shadow-[0_0_0_1px_rgba(0,255,180,0.05),0_14px_40px_rgba(1,4,10,0.5)]">
|
||||
<header className="relative mb-4 rounded-2xl border border-[color:var(--line-weak)] bg-[color:var(--panel)] px-6 py-5 pr-20 shadow-[0_0_0_1px_rgba(0,255,180,0.05),0_14px_40px_rgba(1,4,10,0.5)]">
|
||||
<div className="absolute right-5 top-5 z-10">
|
||||
<TaskNotificationsTrigger
|
||||
unreadCount={notifications.unreadCount}
|
||||
isPopoverOpen={notifications.isPopoverOpen}
|
||||
setIsPopoverOpen={notifications.setIsPopoverOpen}
|
||||
isLoading={notifications.isLoading}
|
||||
activeTasks={notifications.activeTasks}
|
||||
visibleFinishedTasks={notifications.visibleFinishedTasks}
|
||||
awaitingReviewTasks={notifications.awaitingReviewTasks}
|
||||
showReadFinished={notifications.showReadFinished}
|
||||
setShowReadFinished={notifications.setShowReadFinished}
|
||||
openTaskDetails={notifications.openTaskDetails}
|
||||
silenceTask={notifications.silenceTask}
|
||||
markTaskRead={notifications.markTaskRead}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-wrap items-start justify-between gap-4">
|
||||
<div>
|
||||
<p className="terminal-caption text-xs uppercase tracking-[0.3em] text-[color:var(--terminal-muted)]">Live System</p>
|
||||
@@ -432,17 +447,6 @@ export function AppShell({ title, subtitle, actions, activeTicker, breadcrumbs,
|
||||
) : null}
|
||||
</div>
|
||||
<div className="flex flex-wrap items-center gap-2">
|
||||
<TaskNotificationsTrigger
|
||||
unreadCount={notifications.unreadCount}
|
||||
isPopoverOpen={notifications.isPopoverOpen}
|
||||
setIsPopoverOpen={notifications.setIsPopoverOpen}
|
||||
activeTasks={notifications.activeTasks}
|
||||
awaitingReviewTasks={notifications.awaitingReviewTasks}
|
||||
openDrawer={() => notifications.setIsDrawerOpen(true)}
|
||||
openTaskDetails={notifications.openTaskDetails}
|
||||
silenceTask={notifications.silenceTask}
|
||||
markTaskRead={notifications.markTaskRead}
|
||||
/>
|
||||
{actions}
|
||||
<Button variant="ghost" onClick={() => void signOut()} disabled={isSigningOut}>
|
||||
<LogOut className="size-4" />
|
||||
@@ -515,19 +519,6 @@ export function AppShell({ title, subtitle, actions, activeTicker, breadcrumbs,
|
||||
);
|
||||
})}
|
||||
|
||||
<TaskNotificationsTrigger
|
||||
mobile
|
||||
unreadCount={notifications.unreadCount}
|
||||
isPopoverOpen={notifications.isPopoverOpen}
|
||||
setIsPopoverOpen={notifications.setIsPopoverOpen}
|
||||
activeTasks={notifications.activeTasks}
|
||||
awaitingReviewTasks={notifications.awaitingReviewTasks}
|
||||
openDrawer={() => notifications.setIsDrawerOpen(true)}
|
||||
openTaskDetails={notifications.openTaskDetails}
|
||||
silenceTask={notifications.silenceTask}
|
||||
markTaskRead={notifications.markTaskRead}
|
||||
/>
|
||||
|
||||
<button
|
||||
type="button"
|
||||
aria-haspopup="dialog"
|
||||
@@ -590,19 +581,6 @@ export function AppShell({ title, subtitle, actions, activeTicker, breadcrumbs,
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<TaskNotificationsDrawer
|
||||
isOpen={notifications.isDrawerOpen}
|
||||
onClose={() => notifications.setIsDrawerOpen(false)}
|
||||
activeTasks={notifications.activeTasks}
|
||||
visibleFinishedTasks={notifications.visibleFinishedTasks}
|
||||
awaitingReviewTasks={notifications.awaitingReviewTasks}
|
||||
showReadFinished={notifications.showReadFinished}
|
||||
setShowReadFinished={notifications.setShowReadFinished}
|
||||
openTaskDetails={notifications.openTaskDetails}
|
||||
markTaskRead={notifications.markTaskRead}
|
||||
silenceTask={notifications.silenceTask}
|
||||
/>
|
||||
|
||||
<TaskDetailModal
|
||||
isOpen={notifications.isDetailOpen}
|
||||
taskId={notifications.detailTaskId}
|
||||
|
||||
Reference in New Issue
Block a user