diff --git a/client/App.tsx b/client/App.tsx
index 87263cf5..e77ad1d1 100644
--- a/client/App.tsx
+++ b/client/App.tsx
@@ -133,10 +133,10 @@ import MyApplications from "./pages/profile/MyApplications";
 import ClientHub from "./pages/hub/ClientHub";
 import ClientProjects from "./pages/hub/ClientProjects";
 import ClientDashboard from "./pages/hub/ClientDashboard";
-// import ClientInvoices from "./pages/hub/ClientInvoices";
-// import ClientContracts from "./pages/hub/ClientContracts";
-// import ClientReports from "./pages/hub/ClientReports";
-// import ClientSettings from "./pages/hub/ClientSettings";
+import ClientInvoices from "./pages/hub/ClientInvoices";
+import ClientContracts from "./pages/hub/ClientContracts";
+import ClientReports from "./pages/hub/ClientReports";
+import ClientSettings from "./pages/hub/ClientSettings";
 import Space1Welcome from "./pages/internal-docs/Space1Welcome";
 import Space1AxiomModel from "./pages/internal-docs/Space1AxiomModel";
 import Space1FindYourRole from "./pages/internal-docs/Space1FindYourRole";
@@ -161,14 +161,14 @@ import StaffAdmin from "./pages/StaffAdmin";
 import StaffChat from "./pages/StaffChat";
 import StaffDocs from "./pages/StaffDocs";
 import StaffAchievements from "./pages/StaffAchievements";
-// import StaffAnnouncements from "./pages/staff/StaffAnnouncements";
-// import StaffExpenseReports from "./pages/staff/StaffExpenseReports";
-// import StaffInternalMarketplace from "./pages/staff/StaffInternalMarketplace";
-// import StaffKnowledgeBase from "./pages/staff/StaffKnowledgeBase";
-// import StaffLearningPortal from "./pages/staff/StaffLearningPortal";
-// import StaffPerformanceReviews from "./pages/staff/StaffPerformanceReviews";
-// import StaffProjectTracking from "./pages/staff/StaffProjectTracking";
-// import StaffTeamHandbook from "./pages/staff/StaffTeamHandbook";
+import StaffAnnouncements from "./pages/staff/StaffAnnouncements";
+import StaffExpenseReports from "./pages/staff/StaffExpenseReports";
+import StaffInternalMarketplace from "./pages/staff/StaffInternalMarketplace";
+import StaffKnowledgeBase from "./pages/staff/StaffKnowledgeBase";
+import StaffLearningPortal from "./pages/staff/StaffLearningPortal";
+import StaffPerformanceReviews from "./pages/staff/StaffPerformanceReviews";
+import StaffProjectTracking from "./pages/staff/StaffProjectTracking";
+import StaffTeamHandbook from "./pages/staff/StaffTeamHandbook";
 import DeveloperDashboard from "./pages/dev-platform/DeveloperDashboard";
 import ApiReference from "./pages/dev-platform/ApiReference";
 import QuickStart from "./pages/dev-platform/QuickStart";
@@ -513,7 +513,7 @@ const App = () => (
                           path="/staff/announcements"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffAnnouncements />
                             </RequireAccess>
                           }
                         />
@@ -521,7 +521,7 @@ const App = () => (
                           path="/staff/expense-reports"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffExpenseReports />
                             </RequireAccess>
                           }
                         />
@@ -529,7 +529,7 @@ const App = () => (
                           path="/staff/marketplace"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffInternalMarketplace />
                             </RequireAccess>
                           }
                         />
@@ -537,7 +537,7 @@ const App = () => (
                           path="/staff/knowledge-base"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffKnowledgeBase />
                             </RequireAccess>
                           }
                         />
@@ -545,7 +545,7 @@ const App = () => (
                           path="/staff/learning-portal"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffLearningPortal />
                             </RequireAccess>
                           }
                         />
@@ -553,7 +553,7 @@ const App = () => (
                           path="/staff/performance-reviews"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffPerformanceReviews />
                             </RequireAccess>
                           }
                         />
@@ -561,7 +561,7 @@ const App = () => (
                           path="/staff/project-tracking"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffProjectTracking />
                             </RequireAccess>
                           }
                         />
@@ -569,7 +569,7 @@ const App = () => (
                           path="/staff/team-handbook"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <StaffTeamHandbook />
                             </RequireAccess>
                           }
                         />
@@ -652,7 +652,7 @@ const App = () => (
                           path="/hub/client/invoices"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <ClientInvoices />
                             </RequireAccess>
                           }
                         />
@@ -660,7 +660,7 @@ const App = () => (
                           path="/hub/client/contracts"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <ClientContracts />
                             </RequireAccess>
                           }
                         />
@@ -668,7 +668,7 @@ const App = () => (
                           path="/hub/client/reports"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <ClientReports />
                             </RequireAccess>
                           }
                         />
@@ -676,7 +676,7 @@ const App = () => (
                           path="/hub/client/settings"
                           element={
                             <RequireAccess>
-                              <div>Coming Soon</div>
+                              <ClientSettings />
                             </RequireAccess>
                           }
                         />
diff --git a/client/pages/admin/AdminAnalytics.tsx b/client/pages/admin/AdminAnalytics.tsx
index 1dd811a6..b65cf0db 100644
--- a/client/pages/admin/AdminAnalytics.tsx
+++ b/client/pages/admin/AdminAnalytics.tsx
@@ -29,7 +29,7 @@ import {
   ArrowUpRight,
   ArrowDownRight,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Analytics {
diff --git a/client/pages/admin/AdminModeration.tsx b/client/pages/admin/AdminModeration.tsx
index 638aa086..8f92054f 100644
--- a/client/pages/admin/AdminModeration.tsx
+++ b/client/pages/admin/AdminModeration.tsx
@@ -42,7 +42,7 @@ import {
   Ban,
   AlertCircle,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Report {
diff --git a/client/pages/candidate/CandidateInterviews.tsx b/client/pages/candidate/CandidateInterviews.tsx
index f7fe98d3..d5365cc6 100644
--- a/client/pages/candidate/CandidateInterviews.tsx
+++ b/client/pages/candidate/CandidateInterviews.tsx
@@ -32,7 +32,7 @@ import {
   XCircle,
   AlertCircle,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 
diff --git a/client/pages/candidate/CandidateOffers.tsx b/client/pages/candidate/CandidateOffers.tsx
index cfce1f35..9f41fbc3 100644
--- a/client/pages/candidate/CandidateOffers.tsx
+++ b/client/pages/candidate/CandidateOffers.tsx
@@ -40,7 +40,7 @@ import {
   AlertTriangle,
   ExternalLink,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Offer {
diff --git a/client/pages/candidate/CandidatePortal.tsx b/client/pages/candidate/CandidatePortal.tsx
index 95afebd1..4814da58 100644
--- a/client/pages/candidate/CandidatePortal.tsx
+++ b/client/pages/candidate/CandidatePortal.tsx
@@ -29,7 +29,7 @@ import {
   Gift,
   TrendingUp,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface ProfileData {
diff --git a/client/pages/candidate/CandidateProfile.tsx b/client/pages/candidate/CandidateProfile.tsx
index b4369f8b..18872031 100644
--- a/client/pages/candidate/CandidateProfile.tsx
+++ b/client/pages/candidate/CandidateProfile.tsx
@@ -37,7 +37,7 @@ import {
   Save,
   CheckCircle2,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface WorkHistory {
diff --git a/client/pages/hub/ClientContracts.tsx b/client/pages/hub/ClientContracts.tsx
index d936fb00..014e6a50 100644
--- a/client/pages/hub/ClientContracts.tsx
+++ b/client/pages/hub/ClientContracts.tsx
@@ -166,7 +166,7 @@ export default function ClientContracts() {
                 </CardContent>
               </Card>
             </div>
-          </div>
+          </section>
 
           {/* Filters */}
           <div className="flex flex-col md:flex-row gap-4">
diff --git a/client/pages/hub/ClientInvoices.tsx b/client/pages/hub/ClientInvoices.tsx
index 40ac5cfc..d4f319fc 100644
--- a/client/pages/hub/ClientInvoices.tsx
+++ b/client/pages/hub/ClientInvoices.tsx
@@ -210,7 +210,7 @@ export default function ClientInvoices() {
                 </CardContent>
               </Card>
             </div>
-          </div>
+          </section>
 
           {/* Filters */}
           <div className="flex flex-col md:flex-row gap-4">
diff --git a/client/pages/hub/ClientReports.tsx b/client/pages/hub/ClientReports.tsx
index cdd385f4..b71b824d 100644
--- a/client/pages/hub/ClientReports.tsx
+++ b/client/pages/hub/ClientReports.tsx
@@ -203,61 +203,76 @@ export default function ClientReports() {
 
           <section className="py-12">
             <div className="container mx-auto max-w-6xl px-4">
-              <Card className="bg-slate-800/30 border-slate-700">
-                <CardContent className="p-12 text-center">
-                  <TrendingUp className="h-12 w-12 text-slate-600 mx-auto mb-4" />
-                  <p className="text-slate-400 mb-6">
-                    Detailed project reports and analytics coming soon
-                  </p>
-                  <Button
-                    variant="outline"
-                    onClick={() => navigate("/hub/client")}
-                  >
-                    <CardHeader>
-                      <div className="flex items-start justify-between">
-                        <div>
-                          <CardTitle>{project.title}</CardTitle>
-                          <CardDescription>
-                            {new Date(project.start_date).toLocaleDateString()} - {new Date(project.end_date).toLocaleDateString()}
-                          </CardDescription>
-                        </div>
-                        <Badge className={project.status === "active"
-                          ? "bg-green-500/20 text-green-300"
-                          : "bg-blue-500/20 text-blue-300"
-                        }>
-                          {project.status}
-                        </Badge>
-                      </div>
-                    </CardHeader>
-                    <CardContent>
-                      <div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-4">
-                        <div className="p-3 bg-black/30 rounded-lg">
-                          <p className="text-xs text-gray-400">Progress</p>
-                          <p className="text-lg font-bold text-white">{project.progress}%</p>
-                        </div>
-                        <div className="p-3 bg-black/30 rounded-lg">
-                          <p className="text-xs text-gray-400">Budget Spent</p>
-                          <p className="text-lg font-bold text-purple-400">
-                            ${(project.budget_spent / 1000).toFixed(0)}k / ${(project.budget_total / 1000).toFixed(0)}k
-                          </p>
-                        </div>
-                        <div className="p-3 bg-black/30 rounded-lg">
-                          <p className="text-xs text-gray-400">Hours Logged</p>
-                          <p className="text-lg font-bold text-cyan-400">
-                            {project.hours_logged} / {project.hours_estimated}
-                          </p>
-                        </div>
-                        <div className="p-3 bg-black/30 rounded-lg">
-                          <p className="text-xs text-gray-400">Team Size</p>
-                          <p className="text-lg font-bold text-white">{project.team_size}</p>
-                        </div>
-                      </div>
-                      <Progress value={project.progress} className="h-2" />
-                    </CardContent>
-                  </Card>
-                ))
-              )}
-            </TabsContent>
+              <Tabs defaultValue="overview" className="space-y-6">
+                <TabsList className="bg-slate-800/50 border border-slate-700">
+                  <TabsTrigger value="overview">Overview</TabsTrigger>
+                  <TabsTrigger value="budget">Budget</TabsTrigger>
+                  <TabsTrigger value="time">Time</TabsTrigger>
+                </TabsList>
+                <TabsContent value="overview" className="space-y-6">
+                  {projects.length === 0 ? (
+                    <Card className="bg-slate-800/30 border-slate-700">
+                      <CardContent className="p-12 text-center">
+                        <TrendingUp className="h-12 w-12 text-slate-600 mx-auto mb-4" />
+                        <p className="text-slate-400 mb-6">
+                          Detailed project reports and analytics coming soon
+                        </p>
+                        <Button
+                          variant="outline"
+                          onClick={() => navigate("/hub/client")}
+                        >
+                          Back to Hub
+                        </Button>
+                      </CardContent>
+                    </Card>
+                  ) : (
+                    projects.map((project) => (
+                      <Card key={project.id}>
+                        <CardHeader>
+                          <div className="flex items-start justify-between">
+                            <div>
+                              <CardTitle>{project.title}</CardTitle>
+                              <CardDescription>
+                                {new Date(project.start_date).toLocaleDateString()} - {new Date(project.end_date).toLocaleDateString()}
+                              </CardDescription>
+                            </div>
+                            <Badge className={project.status === "active"
+                              ? "bg-green-500/20 text-green-300"
+                              : "bg-blue-500/20 text-blue-300"
+                            }>
+                              {project.status}
+                            </Badge>
+                          </div>
+                        </CardHeader>
+                        <CardContent>
+                          <div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-4">
+                            <div className="p-3 bg-black/30 rounded-lg">
+                              <p className="text-xs text-gray-400">Progress</p>
+                              <p className="text-lg font-bold text-white">{project.progress}%</p>
+                            </div>
+                            <div className="p-3 bg-black/30 rounded-lg">
+                              <p className="text-xs text-gray-400">Budget Spent</p>
+                              <p className="text-lg font-bold text-purple-400">
+                                ${(project.budget_spent / 1000).toFixed(0)}k / ${(project.budget_total / 1000).toFixed(0)}k
+                              </p>
+                            </div>
+                            <div className="p-3 bg-black/30 rounded-lg">
+                              <p className="text-xs text-gray-400">Hours Logged</p>
+                              <p className="text-lg font-bold text-cyan-400">
+                                {project.hours_logged} / {project.hours_estimated}
+                              </p>
+                            </div>
+                            <div className="p-3 bg-black/30 rounded-lg">
+                              <p className="text-xs text-gray-400">Team Size</p>
+                              <p className="text-lg font-bold text-white">{project.team_size}</p>
+                            </div>
+                          </div>
+                          <Progress value={project.progress} className="h-2" />
+                        </CardContent>
+                      </Card>
+                    ))
+                  )}
+                </TabsContent>
 
             {/* Budget Analysis Tab */}
             <TabsContent value="budget" className="space-y-6">
@@ -318,6 +333,8 @@ export default function ClientReports() {
               </Card>
             </TabsContent>
           </Tabs>
+            </div>
+          </section>
         </div>
       </div>
     </Layout>
diff --git a/client/pages/hub/ClientSettings.tsx b/client/pages/hub/ClientSettings.tsx
index d5a98a27..a0bc25fa 100644
--- a/client/pages/hub/ClientSettings.tsx
+++ b/client/pages/hub/ClientSettings.tsx
@@ -284,24 +284,33 @@ export default function ClientSettings() {
 
           <section className="py-12">
             <div className="container mx-auto max-w-6xl px-4">
-              <Card className="bg-slate-800/30 border-slate-700">
-                <CardContent className="p-12 text-center">
-                  <Settings className="h-12 w-12 text-slate-600 mx-auto mb-4" />
-                  <p className="text-slate-400 mb-6">
-                    Account settings and preferences coming soon
-                  </p>
-                  <Button
-                    variant="outline"
-                    onClick={() => navigate("/hub/client")}
-                  >
-                    Back to Portal
-                  </Button>
-                </CardContent>
-              </Card>
-            </TabsContent>
+              <Tabs defaultValue="profile" className="space-y-6">
+                <TabsList className="bg-slate-800/50 border border-slate-700">
+                  <TabsTrigger value="profile">Profile</TabsTrigger>
+                  <TabsTrigger value="team">Team</TabsTrigger>
+                  <TabsTrigger value="notifications">Notifications</TabsTrigger>
+                  <TabsTrigger value="billing">Billing</TabsTrigger>
+                  <TabsTrigger value="security">Security</TabsTrigger>
+                </TabsList>
+                <TabsContent value="profile" className="space-y-6">
+                  <Card className="bg-slate-800/30 border-slate-700">
+                    <CardContent className="p-12 text-center">
+                      <Settings className="h-12 w-12 text-slate-600 mx-auto mb-4" />
+                      <p className="text-slate-400 mb-6">
+                        Account settings and preferences coming soon
+                      </p>
+                      <Button
+                        variant="outline"
+                        onClick={() => navigate("/hub/client")}
+                      >
+                        Back to Portal
+                      </Button>
+                    </CardContent>
+                  </Card>
+                </TabsContent>
 
-            {/* Team Tab */}
-            <TabsContent value="team" className="space-y-6">
+                {/* Team Tab */}
+                <TabsContent value="team" className="space-y-6">
               <Card className="bg-slate-900/50 border-slate-700">
                 <CardHeader>
                   <CardTitle>Team Members</CardTitle>
@@ -555,6 +564,8 @@ export default function ClientSettings() {
               </Card>
             </TabsContent>
           </Tabs>
+            </div>
+          </section>
         </div>
       </div>
     </Layout>
diff --git a/client/pages/staff/StaffAnnouncements.tsx b/client/pages/staff/StaffAnnouncements.tsx
index 807bdfa8..77710aa7 100644
--- a/client/pages/staff/StaffAnnouncements.tsx
+++ b/client/pages/staff/StaffAnnouncements.tsx
@@ -11,7 +11,7 @@ import {
 } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Bell, Pin, Loader2, Eye, EyeOff } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Announcement {
diff --git a/client/pages/staff/StaffExpenseReports.tsx b/client/pages/staff/StaffExpenseReports.tsx
index eb7e2da8..54d377dc 100644
--- a/client/pages/staff/StaffExpenseReports.tsx
+++ b/client/pages/staff/StaffExpenseReports.tsx
@@ -10,7 +10,7 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
 import { Textarea } from "@/components/ui/textarea";
 import { DollarSign, FileText, Calendar, CheckCircle, AlertCircle, Plus, Loader2 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Expense {
diff --git a/client/pages/staff/StaffInternalMarketplace.tsx b/client/pages/staff/StaffInternalMarketplace.tsx
index ad6f5317..5abf4edf 100644
--- a/client/pages/staff/StaffInternalMarketplace.tsx
+++ b/client/pages/staff/StaffInternalMarketplace.tsx
@@ -21,7 +21,7 @@ import {
   Coins,
 } from "lucide-react";
 import { Input } from "@/components/ui/input";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 import {
   Dialog,
diff --git a/client/pages/staff/StaffKnowledgeBase.tsx b/client/pages/staff/StaffKnowledgeBase.tsx
index f820f21f..f6ffbfa0 100644
--- a/client/pages/staff/StaffKnowledgeBase.tsx
+++ b/client/pages/staff/StaffKnowledgeBase.tsx
@@ -24,7 +24,7 @@ import {
   ThumbsUp,
   Eye,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface KnowledgeArticle {
diff --git a/client/pages/staff/StaffLearningPortal.tsx b/client/pages/staff/StaffLearningPortal.tsx
index 65fc37fa..259ff2ae 100644
--- a/client/pages/staff/StaffLearningPortal.tsx
+++ b/client/pages/staff/StaffLearningPortal.tsx
@@ -21,7 +21,7 @@ import {
   CheckCircle,
   Loader2,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Course {
diff --git a/client/pages/staff/StaffOKRs.tsx b/client/pages/staff/StaffOKRs.tsx
index 0ca432eb..647c20f0 100644
--- a/client/pages/staff/StaffOKRs.tsx
+++ b/client/pages/staff/StaffOKRs.tsx
@@ -37,7 +37,7 @@ import {
   ChevronUp,
   Trash2,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface KeyResult {
diff --git a/client/pages/staff/StaffOnboarding.tsx b/client/pages/staff/StaffOnboarding.tsx
index 1529a832..e226f4ee 100644
--- a/client/pages/staff/StaffOnboarding.tsx
+++ b/client/pages/staff/StaffOnboarding.tsx
@@ -27,7 +27,7 @@ import {
   Coffee,
   Loader2,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface OnboardingData {
diff --git a/client/pages/staff/StaffOnboardingChecklist.tsx b/client/pages/staff/StaffOnboardingChecklist.tsx
index d37ad355..e9c47a32 100644
--- a/client/pages/staff/StaffOnboardingChecklist.tsx
+++ b/client/pages/staff/StaffOnboardingChecklist.tsx
@@ -27,7 +27,7 @@ import {
   Briefcase,
   Target,
 } from "lucide-react";
-import { useAuth } from "@/hooks/useAuth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface ChecklistItem {
diff --git a/client/pages/staff/StaffPerformanceReviews.tsx b/client/pages/staff/StaffPerformanceReviews.tsx
index a00c3056..385e2877 100644
--- a/client/pages/staff/StaffPerformanceReviews.tsx
+++ b/client/pages/staff/StaffPerformanceReviews.tsx
@@ -20,7 +20,7 @@ import {
   Users,
   Loader2,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 import {
   Dialog,
diff --git a/client/pages/staff/StaffProjectTracking.tsx b/client/pages/staff/StaffProjectTracking.tsx
index 2aab2d49..50181445 100644
--- a/client/pages/staff/StaffProjectTracking.tsx
+++ b/client/pages/staff/StaffProjectTracking.tsx
@@ -19,7 +19,7 @@ import {
   Plus,
   Calendar,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 import {
   Dialog,
diff --git a/client/pages/staff/StaffTeamHandbook.tsx b/client/pages/staff/StaffTeamHandbook.tsx
index be2dca31..e92e7cb2 100644
--- a/client/pages/staff/StaffTeamHandbook.tsx
+++ b/client/pages/staff/StaffTeamHandbook.tsx
@@ -22,7 +22,7 @@ import {
   ChevronDown,
   ChevronUp,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface HandbookSection {
diff --git a/client/pages/staff/StaffTimeTracking.tsx b/client/pages/staff/StaffTimeTracking.tsx
index 50627e65..7088690b 100644
--- a/client/pages/staff/StaffTimeTracking.tsx
+++ b/client/pages/staff/StaffTimeTracking.tsx
@@ -37,7 +37,7 @@ import {
   Trash2,
   Edit,
 } from "lucide-react";
-import { useAuth } from "@/lib/auth";
+import { useAuth } from "@/contexts/AuthContext";
 import { aethexToast } from "@/components/ui/aethex-toast";
 
 interface Project {