Add updates from working branch

app/courses/[courseId]/layout.tsx

@@ -15,7 +15,7 @@ export default async function CourseLayout({
 
   const response = {
     id: courseId,
-    name: "Sample Course", // Replace with actual API call to fetch course details
+    name: "Sample Course",
   };
   return (
     <div className="max-w-4xl mx-auto bg-white p-6 rounded shadow">

app/courses/[courseId]/modules/[moduleId]/page.tsx

@@ -1,4 +1,3 @@
-// app/courses/[courseId]/modules/[moduleId]/page.tsx
 import ModuleDetail from "@/components/organisation/courses/ModuleDetail";
 import { getAuthUser } from "@/lib/auth";
 

app/courses/layout.tsx

@@ -1,4 +1,3 @@
-// app/courses/layout.tsx
 import { ReactNode } from "react";
 
 export default function CoursesLayout({ children }: { children: ReactNode }) {

app/courses/new/page.tsx

@@ -1,4 +1,3 @@
-// app/courses/new/page.tsx
 import { redirect } from "next/navigation";
 import { getAuthUser } from "@/lib/auth";
 import CourseForm from "@/components/organisation/courses/CourseForm";

app/dashboard/page.tsx

@@ -1,17 +1,26 @@
 import { getAuthUser } from "@/lib/auth";
+import UserDashboard from "@/components/dashboard/UserDashboard";
+import AdminDashboard from "@/components/dashboard/AdminDashboard";
 
 export default async function DashboardPage() {
   const user = await getAuthUser();
   if (!user || !user.hasCompletedOnboarding) {
     return null;
   }
 
+  const isAdmin = user?.organisation?.role === "admin";
+  if (isAdmin) {
+    return (
+      <div className="p-8">
+        <h1 className="text-3xl font-bold mb-4 text-purple-600">Dashboard</h1>
+        <AdminDashboard />
+      </div>
+    );
+  }
   return (
-    <div>
-      <h1>Welcome, {user.firstname || user.email}</h1>
-      <p>Organisation: {user.organisation?.organisationname}</p>
-      <p>Role: {user.organisation.role}</p>
-      <p>Dashboard is currently in progress.</p>
+    <div className="p-8">
+      <h1 className="text-3xl font-bold mb-4 text-purple-600">Dashboard</h1>
+      <UserDashboard />
     </div>
   );
 }

app/history/page.tsx

@@ -1,8 +1,22 @@
+"use client";
+
+import { useAuth } from "@/context/AuthContext";
+import HistoryComponent from "@/components/history/HistoryComponent";
 export default function HistoryPage() {
+  const { user } = useAuth();
+
+  if (!user || !user.hasCompletedOnboarding) {
+    return null;
+  }
   return (
     <div>
-      <h1>History</h1>
-      <p>History page content goes here.</p>
+      <h1 className="text-3xl font-bold mb-6 text-purple-600">
+        Activity History
+      </h1>
+      <p className="mb-4 text-gray-600">
+        View your recent activity and changes made in the system.
+      </p>
+      <HistoryComponent />
     </div>
   );
 }