ClassroomCopilot/app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ClassroomCopilot:1c9ed4bd650da483068bfafe24639d40e53f929b
Branches Tags
ClassroomCopilot:master
ClassroomCopilot:agent/g1-homework-t_91c5f09c
ClassroomCopilot:agent/g2-markbook-t_7ecba14b
ClassroomCopilot:agent/fx-5-scan-ingestion
ClassroomCopilot:agent/fx-8-response-area-attach
ClassroomCopilot:agent/fx-4-confirm-dismiss
ClassroomCopilot:agent/t_a9880d38-exam-corpus-reset-copy
ClassroomCopilot:agent/s4-11-browser-api-base-fix
ClassroomCopilot:agent/s4-11-marking-results
ClassroomCopilot:fix/canvas-shape-z-order
ClassroomCopilot:agent/s4-9c-canvas-ux-polish
ClassroomCopilot:agent/s4-9b-pdf-backdrop
ClassroomCopilot:agent/s4-9a-exam-canvas-core
ClassroomCopilot:agent/s4-10-mark-scheme-editor
ClassroomCopilot:agent/s4-8-2-template-versioning
ClassroomCopilot:agent/s4-9-tldraw-361-spike
ClassroomCopilot:feat/exam-marker-app-dashboard
..
compare: ClassroomCopilot:63d6d1bbca2f5392bef2c7396f38cf354080b642
Branches Tags
ClassroomCopilot:agent/g1-homework-t_91c5f09c
ClassroomCopilot:agent/g2-markbook-t_7ecba14b
ClassroomCopilot:master
ClassroomCopilot:agent/fx-5-scan-ingestion
ClassroomCopilot:agent/fx-8-response-area-attach
ClassroomCopilot:agent/fx-4-confirm-dismiss
ClassroomCopilot:agent/t_a9880d38-exam-corpus-reset-copy
ClassroomCopilot:agent/s4-11-browser-api-base-fix
ClassroomCopilot:agent/s4-11-marking-results
ClassroomCopilot:fix/canvas-shape-z-order
ClassroomCopilot:agent/s4-9c-canvas-ux-polish
ClassroomCopilot:agent/s4-9b-pdf-backdrop
ClassroomCopilot:agent/s4-9a-exam-canvas-core
ClassroomCopilot:agent/s4-10-mark-scheme-editor
ClassroomCopilot:agent/s4-8-2-template-versioning
ClassroomCopilot:agent/s4-9-tldraw-361-spike
ClassroomCopilot:feat/exam-marker-app-dashboard

No commits in common. "1c9ed4bd650da483068bfafe24639d40e53f929b" and "63d6d1bbca2f5392bef2c7396f38cf354080b642" have entirely different histories.
1c9ed4bd65 ... 63d6d1bbca

2 changed files with 20 additions and 26 deletions
Show Stats Expand all files Collapse all files

38
src/pages/timetable/MyClassesPage.tsx
View File

@ -88,25 +88,25 @@ const MyClassesPage: React.FC = () => {
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3"> <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{teachingClasses.map((classItem) => ( {teachingClasses.map((classItem) => (
<Link <Link
key={classItem.id} key={classItem.class_id}
to={`/classes/${classItem.id}`} to={`/timetable/classes/${classItem.class_id}`}
className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200" className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200"
> >
<div className="p-5"> <div className="p-5">
<div className="flex items-start justify-between mb-3"> <div className="flex items-start justify-between mb-3">
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<h3 className="text-lg font-semibold text-gray-900 truncate"> <h3 className="text-lg font-semibold text-gray-900 truncate">
{classItem.name} {classItem.class?.name}
</h3> </h3>
{classItem.class_code && ( {classItem.class?.code && (
<p className="text-sm text-gray-500">{classItem.class_code}</p> <p className="text-sm text-gray-500">{classItem.class.code}</p>
)} )}
</div> </div>
<KeyboardArrowRight className="text-gray-400 flex-shrink-0 ml-2" size={20} /> <KeyboardArrowRight className="text-gray-400 flex-shrink-0 ml-2" size={20} />
</div> </div>
<p className="text-gray-600 text-sm mb-4 line-clamp-2"> <p className="text-gray-600 text-sm mb-4 line-clamp-2">
{classItem.description || 'No description'} {classItem.class?.description || 'No description'}
</p> </p>
<div className="flex items-center gap-2 flex-wrap"> <div className="flex items-center gap-2 flex-wrap">
@ -121,12 +121,12 @@ const MyClassesPage: React.FC = () => {
<div className="mt-4 pt-4 border-t border-gray-100 flex items-center gap-4 text-sm text-gray-500"> <div className="mt-4 pt-4 border-t border-gray-100 flex items-center gap-4 text-sm text-gray-500">
<div className="flex items-center gap-1"> <div className="flex items-center gap-1">
<People size={14} /> <People size={14} />
<span>{(classItem as any).enrolled_count || 0} students</span> <span>{classItem.class?.enrolled_count || 0} students</span>
</div> </div>
{classItem.academic_year && ( {classItem.class?.academic_year && (
<div className="flex items-center gap-1"> <div className="flex items-center gap-1">
<School size={14} /> <School size={14} />
<span>{classItem.academic_year}</span> <span>{classItem.class.academic_year}</span>
</div> </div>
)} )}
</div> </div>
@ -151,25 +151,25 @@ const MyClassesPage: React.FC = () => {
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3"> <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{enrolledClasses.map((classItem) => ( {enrolledClasses.map((classItem) => (
<Link <Link
key={classItem.id} key={classItem.class_id}
to={`/classes/${classItem.id}`} to={`/timetable/classes/${classItem.class_id}`}
className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200" className="block bg-white rounded-lg shadow hover:shadow-md transition-shadow border border-gray-200"
> >
<div className="p-5"> <div className="p-5">
<div className="flex items-start justify-between mb-3"> <div className="flex items-start justify-between mb-3">
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<h3 className="text-lg font-semibold text-gray-900 truncate"> <h3 className="text-lg font-semibold text-gray-900 truncate">
{classItem.name} {classItem.class?.name}
</h3> </h3>
{classItem.class_code && ( {classItem.class?.code && (
<p className="text-sm text-gray-500">{classItem.class_code}</p> <p className="text-sm text-gray-500">{classItem.class.code}</p>
)} )}
</div> </div>
<KeyboardArrowRight className="text-gray-400 flex-shrink-0 ml-2" size={20} /> <KeyboardArrowRight className="text-gray-400 flex-shrink-0 ml-2" size={20} />
</div> </div>
<p className="text-gray-600 text-sm mb-4 line-clamp-2"> <p className="text-gray-600 text-sm mb-4 line-clamp-2">
{classItem.description || 'No description'} {classItem.class?.description || 'No description'}
</p> </p>
<div className="flex items-center gap-2 flex-wrap"> <div className="flex items-center gap-2 flex-wrap">
@ -182,13 +182,13 @@ const MyClassesPage: React.FC = () => {
<div className="flex items-center gap-1"> <div className="flex items-center gap-1">
<School size={14} /> <School size={14} />
<span> <span>
{(classItem as any).primary_teacher_name} {} {classItem.class?.teachers?.[0]?.first_name} {classItem.class?.teachers?.[0]?.last_name}
</span> </span>
</div> </div>
{classItem.academic_year && ( {classItem.class?.academic_year && (
<div className="flex items-center gap-1"> <div className="flex items-center gap-1">
<School size={14} /> <School size={14} />
<span>{classItem.academic_year}</span> <span>{classItem.class.academic_year}</span>
</div> </div>
)} )}
</div> </div>
@ -208,7 +208,7 @@ const MyClassesPage: React.FC = () => {
You are not enrolled in or teaching any classes yet. You are not enrolled in or teaching any classes yet.
</p> </p>
<Link <Link
to="/classes" to="/timetable/classes"
className="mt-4 inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-blue-700 bg-blue-100 hover:bg-blue-200" className="mt-4 inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md text-blue-700 bg-blue-100 hover:bg-blue-200"
> >
Browse Available Classes Browse Available Classes

8
src/utils/tldraw/ui-overrides/components/shared/navigation/CCGraphNavPanel.tsx
View File

@ -484,7 +484,6 @@ function TreeItem({ node, depth, onSelect, onExpand }: TreeItemProps) {
export function CCGraphNavPanel() { export function CCGraphNavPanel() {
const { accessToken } = useAuth(); const { accessToken } = useAuth();
const navigate = useNavigate();
const { navigateToNeoNode, context } = useNavigationStore(); const { navigateToNeoNode, context } = useNavigationStore();
const [tree, setTree] = useState<TreeNode | null>(null); const [tree, setTree] = useState<TreeNode | null>(null);
const [schoolStatus, setSchoolStatus] = useState<SchoolStatus | null>(null); const [schoolStatus, setSchoolStatus] = useState<SchoolStatus | null>(null);
@ -627,13 +626,8 @@ export function CCGraphNavPanel() {
const handleSelect = useCallback((node: TreeNode) => { const handleSelect = useCallback((node: TreeNode) => {
// Section nodes with artificial IDs (node_type="Section") have no canvas shape util // Section nodes with artificial IDs (node_type="Section") have no canvas shape util
if (node.is_section && node.node_type === "Section") return; if (node.is_section && node.node_type === "Section") return;
// SubjectClass nodes don't yet exist in Neo4j — navigate to class detail page
if (node.node_type === "SubjectClass") {
navigate(`/classes/${node.neo4j_node_id}`);
return;
}
navigateToNeoNode(node); navigateToNeoNode(node);
}, [navigateToNeoNode, navigate]); }, [navigateToNeoNode]);
const refreshAll = useCallback(() => { const refreshAll = useCallback(() => {
setTree(null); setTree(null);