diff --git a/app/dfda/components/DFDAFooter.tsx b/app/dfda/components/DFDAFooter.tsx index e490cad4..32c1005c 100644 --- a/app/dfda/components/DFDAFooter.tsx +++ b/app/dfda/components/DFDAFooter.tsx @@ -1,9 +1,40 @@ -'use client' +"use client" -export default function DFDAFooter() { +import Link from "next/link" +import { NavItem } from "@/types" + +interface DFDAFooterProps { + navItems?: NavItem[] +} + +export default function DFDAFooter({ navItems = [] }: DFDAFooterProps) { return ( ) -} \ No newline at end of file +} \ No newline at end of file diff --git a/app/dfda/components/DfdaTopNavbar.tsx b/app/dfda/components/DfdaTopNavbar.tsx index 3b311b95..8f5c2a7d 100644 --- a/app/dfda/components/DfdaTopNavbar.tsx +++ b/app/dfda/components/DfdaTopNavbar.tsx @@ -5,12 +5,14 @@ import Link from "next/link" import { NavItem } from "@/types" import { User } from "next-auth" -import { dfdaAvatarNav, generalDashboardTopNav } from "@/config/links" +import { getNavigationForDomain } from "@/config/navigation" import { UserNavDisplay } from "@/components/user/user-nav-display" + import { DfdaLogoNavMenu } from "./dfda-logo-nav" interface NavbarProps extends React.HTMLAttributes { user: Pick + domain?: string logoNavItems?: NavItem[] topNavItems?: NavItem[] avatarNavItems?: NavItem[] @@ -18,15 +20,18 @@ interface NavbarProps extends React.HTMLAttributes { export default function DfdaTopNavbar({ user, + domain = "dfda.earth", logoNavItems, topNavItems, avatarNavItems, }: NavbarProps) { + const navigation = getNavigationForDomain(domain) + if (!topNavItems) { - topNavItems = generalDashboardTopNav.data + topNavItems = navigation.topNav } - if(!avatarNavItems) { - avatarNavItems = dfdaAvatarNav.data + if (!avatarNavItems) { + avatarNavItems = navigation.avatarNav } return (
diff --git a/app/dfda/components/right-to-trial-act.tsx b/app/dfda/components/right-to-trial-act.tsx deleted file mode 100644 index 5dd914df..00000000 --- a/app/dfda/components/right-to-trial-act.tsx +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react' -import Link from 'next/link' -import { ArrowLeft, FileText, CheckCircle, AlertTriangle } from 'lucide-react' -import { Button } from '@/components/ui/button' - -export default function RightToTrialActPage() { - return ( -
-
-

Right to Trial Act ๐Ÿ“œ

-

Revolutionizing Access to Treatments

-
- -
-
-

- - Key Points -

-
    -
  • Ensures the right to try any treatment after basic safety testing
    • -
  • Establishes a free, open platform to cut trial costs
    • -
  • Removes barriers to access proven treatments
    • -
  • Measures and rewards real-world results
    • -
  • Establishes FDAi for ongoing treatment outcome analysis
    • -
-
- -
-

- - Benefits -

-
    -
  • Cuts clinical trial costs by 90% with open infrastructure
    • -
  • Saves $2 trillion annually by focusing on prevention
    • -
  • Reduces time-to-market via universal trial participation
    • -
  • Rewards companies for genuine cures, fostering real price competition
    • -
-
- -
-

- - Current System Failures -

-
    -
  • FDA approval process delays access to life-saving treatments by 7-12 years on average
    • -
  • Only 3% of patients qualify for traditional clinical trials
    • -
  • Real-world outcome data is collected for less than 10% of approved drugs
    • -
  • $2.6B average cost of drug development drives 10-100x markup in consumer prices
    • -
-
- -
- -
-
- -
- - - Back to Home - -
-
- ) -} \ No newline at end of file diff --git a/app/dfda/layout.tsx b/app/dfda/layout.tsx index 6b7dc2f3..986930b7 100644 --- a/app/dfda/layout.tsx +++ b/app/dfda/layout.tsx @@ -1,17 +1,18 @@ import React from "react" +import { getNavigationForDomain } from "@/config/navigation" import { getCurrentUser } from "@/lib/session" + +import DFDAFooter from "./components/DFDAFooter" import DfdaTopNavbar from "./components/DfdaTopNavbar" -import DFDAFooter from './components/DFDAFooter' -interface DashboardLayoutProps { +interface DFDALayoutProps { children: React.ReactNode } -export default async function DashboardLayout({ - children, -}: DashboardLayoutProps) { +export default async function DFDALayout({ children }: DFDALayoutProps) { const user = await getCurrentUser() + const navigation = getNavigationForDomain("dfda.earth") return (
@@ -21,13 +22,13 @@ export default async function DashboardLayout({ image: user?.image, email: user?.email, }} + topNavItems={navigation.topNav} + avatarNavItems={navigation.avatarNav} /> -
- {children} -
+
{children}
- +
) -} +} \ No newline at end of file diff --git a/app/dfda/right-to-trial-act/components/right-to-trial-act.tsx b/app/dfda/right-to-trial-act/components/right-to-trial-act.tsx index e72adcd6..0793ac1f 100644 --- a/app/dfda/right-to-trial-act/components/right-to-trial-act.tsx +++ b/app/dfda/right-to-trial-act/components/right-to-trial-act.tsx @@ -1,11 +1,9 @@ -'use client'; - -import React, { useState } from 'react'; -import { motion } from 'framer-motion'; - - +"use client" +import React, { useState } from "react" +import { motion } from "framer-motion" +import CostSavingsTable from "../../components/CostSavingsTable" // First, let's define the interfaces interface Section { @@ -47,11 +45,17 @@ const Header = () => (

RIGHT TO TRIAL ACT ๐Ÿงช๐Ÿ’Š

-

Faster Cures, Lower Costs, Universal Access ๐Ÿš€๐Ÿฅ

+

+ Faster Cures, Lower Costs, Universal Access ๐Ÿš€๐Ÿฅ +

) -const Navigation = ({ sections, activeSection, setActiveSection }: NavigationProps) => ( +const Navigation = ({ + sections, + activeSection, + setActiveSection, +}: NavigationProps) => (