improvement: account setting added to header in order to choose organizations/subscribtions/etc

2026-04-29 21:55:46 +03:30
parent ca9e684ab4
commit 7a847d5326
12 changed files with 517 additions and 82 deletions
--- a/frontend/src/app/(dashboard)/layout.tsx
+++ b/frontend/src/app/(dashboard)/layout.tsx
@@ -1,18 +1,15 @@
 'use client';

-import { memo, useCallback, useEffect } from 'react';
+import { memo, useEffect } from 'react';
 import { useRouter } from 'next/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import Sidebar from '@/components/ui/Sidebar';
 import { ThemeToggle } from '@/components/ui/ThemeToggle';
-import { LogOut } from 'lucide-react';
+import { DashboardAccountMenu } from '@/components/ui/DashboardAccountMenu';

 export default function DashboardLayout({ children }: { children: React.ReactNode }) {
-  const { user, currentOrganization, isAuthReady, logout } = useAuth();
+  const { user, currentOrganization, isAuthReady } = useAuth();
  const router = useRouter();
-  const handleLogout = useCallback(() => {
-    void logout();
-  }, [logout]);

  // ✅ AUTH GUARD (runs once per navigation group)
  useEffect(() => {
@@ -51,11 +48,7 @@ export default function DashboardLayout({ children }: { children: React.ReactNod
      <Sidebar />

      <div className="flex-1 flex flex-col">
-        <DashboardHeader
-          organizationName={currentOrganization.name}
-          userName={user.name}
-          onLogout={handleLogout}
-        />
+        <DashboardHeader organizationName={currentOrganization.name} />

        <main className="p-6 flex-1 overflow-y-auto">
          <div className="surface-panel p-6 min-h-full">
@@ -69,27 +62,16 @@ export default function DashboardLayout({ children }: { children: React.ReactNod

 const DashboardHeader = memo(function DashboardHeader({
  organizationName,
-  userName,
-  onLogout,
 }: {
  organizationName: string;
-  userName: string;
-  onLogout: () => void;
 }) {
  return (
-    <header className="flex justify-between px-6 py-4 border-b border-border/70 backdrop-blur-sm">
-      <h2 className="text-lg font-medium">{organizationName}</h2>
+    <header className="h-[71px] flex justify-between items-center gap-4 px-6 border-b border-border/70 backdrop-blur-sm">
+      <h2 className="text-lg font-medium truncate min-w-0">{organizationName}</h2>

-      <div className="flex items-center gap-4">
+      <div className="flex items-center gap-3 shrink-0">
        <ThemeToggle />
-        <span className="text-sm text-text-secondary">{userName}</span>
-        <button
-          onClick={onLogout}
-          className="inline-flex items-center gap-2 text-sm text-text-secondary hover:text-text-primary transition-colors"
-        >
-          <LogOut className="w-4 h-4 icon-flat" />
-          Logout
-        </button>
+        <DashboardAccountMenu />
      </div>
    </header>
  );
--- a/frontend/src/app/(dashboard)/settings/account/page.tsx
+++ b/frontend/src/app/(dashboard)/settings/account/page.tsx
@@ -0,0 +1,29 @@
+'use client';
+
+import Link from 'next/link';
+
+export default function AccountSettingsPage() {
+  return (
+    <div className="max-w-xl space-y-6">
+      <div>
+        <Link
+          href="/today"
+          className="text-sm text-primary hover:opacity-90"
+        >
+          ← Back to app
+        </Link>
+        <h1 className="text-2xl font-semibold text-text-primary mt-4">Account</h1>
+        <p className="text-text-secondary text-sm mt-2">
+          Profile and security settings for your login.
+        </p>
+      </div>
+
+      <div className="surface-card p-6 space-y-3">
+        <p className="text-sm text-text-secondary">
+          Password change and profile editing will be wired here next (e.g. invite
+          flow, reset password).
+        </p>
+      </div>
+    </div>
+  );
+}
--- a/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
+++ b/frontend/src/app/(dashboard)/settings/subscriptions/page.tsx
@@ -0,0 +1,103 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import Link from 'next/link';
+import { useRouter } from 'next/navigation';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { authApi } from '@/lib/api/auth';
+import type { SubscriptionAlertData } from '@/types';
+
+export default function SubscriptionsSettingsPage() {
+  const { currentOrganization } = useAuth();
+  const router = useRouter();
+  const [alert, setAlert] = useState<SubscriptionAlertData | null>(null);
+
+  useEffect(() => {
+    if (currentOrganization && !currentOrganization.isOwner) {
+      router.replace('/today');
+    }
+  }, [currentOrganization, router]);
+
+  useEffect(() => {
+    if (!currentOrganization?.isOwner) return;
+    void authApi.getSubscriptionAlert().then((r) => {
+      if (r.success) setAlert(r.data);
+    });
+  }, [currentOrganization?.id, currentOrganization?.isOwner]);
+
+  if (!currentOrganization) {
+    return (
+      <p className="text-text-secondary text-sm">Loading...</p>
+    );
+  }
+
+  if (!currentOrganization.isOwner) {
+    return (
+      <p className="text-text-secondary text-sm">Redirecting...</p>
+    );
+  }
+
+  const plan = currentOrganization.plan;
+  const maxUsers = plan?.maxUsers;
+
+  return (
+    <div className="max-w-xl space-y-6">
+      <div>
+        <Link
+          href="/today"
+          className="text-sm text-primary hover:opacity-90"
+        >
+          ← Back to app
+        </Link>
+        <h1 className="text-2xl font-semibold text-text-primary mt-4">Subscriptions</h1>
+        <p className="text-text-secondary text-sm mt-2">
+          Your DyoLink workspace plan and seats for{' '}
+          <span className="text-text-primary font-medium">{currentOrganization.name}</span>.
+          Clinic and lab income tracking stays under the sidebar{' '}
+          <span className="text-text-primary">Billing</span> tab.
+        </p>
+      </div>
+
+      <div className="surface-card p-6 space-y-4">
+        <div className="flex flex-wrap gap-4 justify-between">
+          <div>
+            <p className="text-xs text-text-muted uppercase tracking-wide">Current plan</p>
+            <p className="text-lg font-medium text-text-primary capitalize">
+              {plan?.name ?? '—'}
+            </p>
+          </div>
+          {typeof maxUsers === 'number' && maxUsers < 999999 && (
+            <div>
+              <p className="text-xs text-text-muted uppercase tracking-wide">Seats (this org)</p>
+              <p className="text-lg font-medium text-text-primary">
+                {alert?.seatsUsed ?? '—'} / {maxUsers}
+              </p>
+            </div>
+          )}
+        </div>
+
+        {alert?.showWarning && (
+          <div className="text-sm text-text-secondary space-y-1">
+            {alert.trialExpired && (
+              <p>Trial period has ended. Choose a plan when checkout is available.</p>
+            )}
+            {!alert.trialExpired && alert.trialEndingSoon && (
+              <p>
+                Trial ends in {alert.daysUntilTrialEnd ?? '—'} day(s).
+              </p>
+            )}
+            {!alert.trialExpired && !alert.trialEndingSoon && alert.seatsLow && (
+              <p>Seat usage is high for this organization.</p>
+            )}
+          </div>
+        )}
+
+        <p className="text-sm text-text-secondary">
+          Payment and plan upgrades will connect here. The warning on the settings
+          icon is only shown to workspace owners when seats are low or the trial window
+          is ending.
+        </p>
+      </div>
+    </div>
+  );
+}
--- a/frontend/src/components/ui/DashboardAccountMenu.tsx
+++ b/frontend/src/components/ui/DashboardAccountMenu.tsx
@@ -0,0 +1,156 @@
+'use client';
+
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import Link from 'next/link';
+import {
+  Settings,
+  AlertTriangle,
+  Building2,
+  CreditCard,
+  User,
+  LogOut,
+  ChevronDown,
+} from 'lucide-react';
+import { useAuth } from '@/lib/hooks/useAuth';
+import { authApi } from '@/lib/api/auth';
+import type { SubscriptionAlertData } from '@/types';
+
+function warningTooltip(data: SubscriptionAlertData | null): string {
+  if (!data?.showWarning) return '';
+  if (data.trialExpired) return 'Trial ended — review Subscriptions';
+  if (data.trialEndingSoon) return 'Trial ending soon — review Subscriptions';
+  if (data.seatsLow) return 'Seats running low — review Subscriptions';
+  return 'Review Subscriptions';
+}
+
+export function DashboardAccountMenu() {
+  const { user, currentOrganization, logout } = useAuth();
+  const [open, setOpen] = useState(false);
+  const menuRef = useRef<HTMLDivElement>(null);
+  const [alert, setAlert] = useState<SubscriptionAlertData | null>(null);
+  const isOwner = currentOrganization?.isOwner ?? false;
+
+  useEffect(() => {
+    const onDocClick = (e: MouseEvent) => {
+      if (menuRef.current && !menuRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    };
+    document.addEventListener('mousedown', onDocClick);
+    return () => document.removeEventListener('mousedown', onDocClick);
+  }, []);
+
+  useEffect(() => {
+    if (!isOwner || !currentOrganization) {
+      setAlert(null);
+      return;
+    }
+    let cancelled = false;
+    void (async () => {
+      try {
+        const res = await authApi.getSubscriptionAlert();
+        if (!cancelled && res.success) setAlert(res.data);
+      } catch {
+        if (!cancelled) setAlert(null);
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [isOwner, currentOrganization?.id]);
+
+  const showWarning = Boolean(isOwner && alert?.showWarning);
+  const tooltip = useMemo(() => warningTooltip(alert), [alert]);
+
+  const handleLogout = useCallback(() => {
+    setOpen(false);
+    void logout();
+  }, [logout]);
+
+  return (
+    <div className="relative" ref={menuRef}>
+      <button
+        type="button"
+        onClick={() => setOpen((v) => !v)}
+        className="inline-flex items-center gap-2 rounded-[var(--radius-md)] border border-border/70 px-3 py-2 text-sm text-text-primary hover:bg-background-card/80 transition-colors"
+        aria-expanded={open}
+        aria-haspopup="menu"
+      >
+        <span className="relative inline-flex shrink-0" title={showWarning ? tooltip : undefined}>
+          <Settings className="h-5 w-5 icon-flat" aria-hidden />
+          {showWarning && (
+            <span
+              className="absolute -right-1 -top-1 flex h-3.5 w-3.5 items-center justify-center rounded-full bg-amber-500 ring-2 ring-background-secondary"
+              aria-label={tooltip}
+            >
+              <AlertTriangle className="h-2.5 w-2.5 text-amber-950" strokeWidth={2.5} />
+            </span>
+          )}
+        </span>
+        <span className="hidden sm:inline max-w-[160px] truncate">{user?.name}</span>
+        <ChevronDown className="h-4 w-4 text-text-muted shrink-0" aria-hidden />
+      </button>
+
+      {open && (
+        <div
+          role="menu"
+          className="absolute right-0 mt-2 w-72 rounded-[var(--radius-md)] border border-border bg-background-secondary/95 py-2 shadow-lg z-50 backdrop-blur-sm"
+        >
+          <div className="px-3 py-2 border-b border-border/60">
+            <p className="text-xs text-text-muted">Signed in</p>
+            <p className="text-sm font-medium truncate">{user?.email}</p>
+            <p className="text-xs text-text-secondary mt-1 truncate">
+              {currentOrganization?.name}
+            </p>
+          </div>
+
+          <div className="py-1">
+            <Link
+              href="/select-organization"
+              role="menuitem"
+              className="flex items-center gap-3 px-3 py-2.5 text-sm text-text-primary hover:bg-background-card/70"
+              onClick={() => setOpen(false)}
+            >
+              <Building2 className="h-4 w-4 icon-flat shrink-0" />
+              Switch organization
+            </Link>
+
+            {isOwner && (
+              <Link
+                href="/settings/subscriptions"
+                role="menuitem"
+                className="flex items-center gap-3 px-3 py-2.5 text-sm text-text-primary hover:bg-background-card/70"
+                onClick={() => setOpen(false)}
+              >
+                <CreditCard className="h-4 w-4 icon-flat shrink-0" />
+                Subscriptions
+              </Link>
+            )}
+
+            <Link
+              href="/settings/account"
+              role="menuitem"
+              className="flex items-center gap-3 px-3 py-2.5 text-sm text-text-primary hover:bg-background-card/70"
+              onClick={() => setOpen(false)}
+            >
+              <User className="h-4 w-4 icon-flat shrink-0" />
+              Account
+            </Link>
+          </div>
+
+          <div className="border-t border-border/60 pt-1">
+            <button
+              type="button"
+              role="menuitem"
+              className="flex w-full items-center gap-3 px-3 py-2.5 text-sm text-text-secondary hover:bg-background-card/70 hover:text-text-primary"
+              onClick={handleLogout}
+            >
+              <LogOut className="h-4 w-4 icon-flat shrink-0" />
+              Log out
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
--- a/frontend/src/components/ui/Sidebar.tsx
+++ b/frontend/src/components/ui/Sidebar.tsx
@@ -11,7 +11,6 @@ import {
  FlaskConical,
  FileText,
  CreditCard,
-  Building2
 } from 'lucide-react';

 const menu = [
@@ -22,19 +21,19 @@ const menu = [
  { name: 'Lab Management', path: '/lab', icon: FlaskConical },
  { name: 'Billing', path: '/billing', icon: CreditCard },
  { name: 'Reports', path: '/reports', icon: FileText },
-  { name: 'Organizations', path: '/select-organization', icon: Building2 },
 ];

 function Sidebar() {
  const pathname = usePathname();

  return (
-    <aside className="w-64 bg-background-secondary/90 border-r border-border text-text-primary flex flex-col p-4">
-      <div className="mb-6 pb-4 border-b border-border">
-        <h1 className="text-xl font-semibold tracking-tight">DyoLink</h1>
+    <aside className="w-64 bg-background-secondary/90 border-r border-border text-text-primary flex flex-col">
+      <div className="h-[71px] px-4 flex items-center">
+        <h1 className="text-lg font-medium tracking-tight">DyoLink</h1>
      </div>
+      <div className="mx-4 border-b border-border/70" />

-      <nav className="flex flex-col gap-2">
+      <nav className="flex flex-col gap-2 p-4">
        {menu.map((item) => {
          const Icon = item.icon;
          const isActive = pathname === item.path;
--- a/frontend/src/lib/api/auth.ts
+++ b/frontend/src/lib/api/auth.ts
@@ -1,6 +1,6 @@
 // src/lib/api/auth.ts
 import { apiClient } from './client';
-import { AuthResponse, TrialRegistrationData, LoginData } from '@/types';
+import { AuthResponse, TrialRegistrationData, LoginData, SubscriptionAlertData } from '@/types';

 export const authApi = {
  // Register a new trial organization
@@ -21,6 +21,15 @@ export const authApi = {
    return response.data;
  },

+  /** Owner-only meaningful data; staff always gets showWarning: false */
+  getSubscriptionAlert: async (): Promise<{
+    success: boolean;
+    data: SubscriptionAlertData;
+  }> => {
+    const response = await apiClient.get('/auth/subscription-alert');
+    return response.data;
+  },
+
  // Select organization
  selectOrganization: async (organizationId: string): Promise<any> => {
    const response = await apiClient.post('/auth/select-organization', { organizationId });
--- a/frontend/src/lib/hooks/useAuth.tsx
+++ b/frontend/src/lib/hooks/useAuth.tsx
@@ -218,7 +218,13 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {

      localStorage.setItem('currentOrganizationId', organization.id);

-      setCurrentOrganization(organization);
+      setCurrentOrganization({
+        id: organization.id,
+        name: organization.name,
+        type: organization.type as Organization['type'],
+        isOwner: Boolean((organization as { isOwner?: boolean }).isOwner),
+        plan: (organization as { plan?: Organization['plan'] }).plan,
+      });

      router.push('/today');

--- a/frontend/src/middleware.ts
+++ b/frontend/src/middleware.ts
@@ -3,7 +3,6 @@ import { NextResponse } from 'next/server';
 import type { NextRequest } from 'next/server';

 const publicRoutes = ['/', '/login', '/register', '/terms', '/privacy', '/forgot-password'];
-const authOnlyRoutes = ['/login', '/register']; // routes that should NOT be accessed when logged in

 export function middleware(request: NextRequest) {
  const { pathname } = request.nextUrl;
@@ -15,12 +14,10 @@ export function middleware(request: NextRequest) {
    return NextResponse.redirect(new URL('/today', request.url));
  }

-  // Always allow public routes first
+  // Always allow public routes first. We intentionally do not block /login or /register
+  // when a cookie exists, because the cookie might be stale/invalid and the client
+  // auth check needs to recover gracefully.
  if (publicRoutes.includes(pathname)) {
-    // If user is already logged in and tries to access login/register → redirect to dashboard
-    if (isAuthenticated && authOnlyRoutes.includes(pathname)) {
-      return NextResponse.redirect(new URL('/today', request.url));
-    }
    return NextResponse.next();
  }

--- a/frontend/src/types/index.ts
+++ b/frontend/src/types/index.ts
@@ -10,12 +10,25 @@ export interface Organization {
  name: string;
  type: 'CLINIC' | 'LAB';
  isOwner: boolean;
+  permissions?: string[];
  plan?: {
    name: string;
    maxUsers: number;
  };
 }

+/** GET /auth/subscription-alert — owners only get meaningful flags */
+export interface SubscriptionAlertData {
+  showWarning: boolean;
+  seatsLow: boolean;
+  trialEndingSoon: boolean;
+  trialExpired: boolean;
+  seatsUsed?: number;
+  seatsLimit?: number;
+  daysUntilTrialEnd?: number | null;
+  trialEndsAt?: string | null;
+}
+
 export interface AuthResponse {
  success: boolean;
  data: {