Remove General Materials confusion - require actual subject selection

Author: html-proof

src/components/dashboard/UploadFlow.tsx

@@ -36,8 +36,8 @@ export default function UploadFlow() {
     const [selectedSub, setSelectedSub] = useState("");
     const [selectedFolder, setSelectedFolder] = useState("");
 
-    // Simplified selection check (Dept -> Sem -> Sub)
-    const isSelectionComplete = selectedDept && selectedSem;
+    // Selection check: Dept -> Sem -> Sub (all required)
+    const isSelectionComplete = selectedDept && selectedSem && selectedSub;
 
     const [folders, setFolders] = useState<any[]>([]);
     const [notes, setNotes] = useState<any[]>([]);
@@ -108,7 +108,7 @@ export default function UploadFlow() {
         try {
             // 1. Create the folder
             const ref = await createFolder({
-                subjectId: selectedSub || "general",
+                subjectId: selectedSub,
                 semesterId: selectedSem,
                 batchId: null, // Batch removed
                 departmentId: selectedDept,
@@ -231,7 +231,7 @@ export default function UploadFlow() {
                     folderMap.set(folderName, existing.id);
                 } else {
                     const ref = await createFolder({
-                        subjectId: selectedSub || "general",
+                        subjectId: selectedSub,
                         semesterId: selectedSem,
                         batchId: null, // Batch removed
                         departmentId: selectedDept,
@@ -268,7 +268,7 @@ export default function UploadFlow() {
                         departmentId: selectedDept,
                         batchId: null, // Batch removed
                         semesterId: selectedSem,
-                        subjectId: selectedSub || "general",
+                        subjectId: selectedSub,
                         folderId: targetFolderId,
                         title: file.name.replace(/\.[^/.]+$/, ""),
                         fileUrl: url,
@@ -341,7 +341,7 @@ export default function UploadFlow() {
                 transition: "opacity 0.3s"
             }}>
 
-                {!isSelectionComplete && <p style={{ color: "var(--primary)", fontWeight: 500, marginBottom: "1rem" }}>Please select Department and Semester to enable upload options.</p>}
+                {!isSelectionComplete && <p style={{ color: "var(--primary)", fontWeight: 500, marginBottom: "1rem" }}>Please select Department, Semester, and Subject to enable upload options.</p>}
 
                 <div style={{ marginBottom: "1.5rem", padding: "1rem", background: "var(--surface)", borderRadius: "8px", border: "1px solid var(--border)" }}>
                     <div style={{ display: "flex", alignItems: "center", justifyContent: "space-between", marginBottom: "0.5rem" }}>

src/components/public/NotesBrowser.tsx

@@ -66,8 +66,7 @@ export default function NotesBrowser() {
                 if (sem) {
                     setSelectedSem(sem);
                     const realSubjects = await getSubjects(sem.id);
-                    const generalSubject = { id: "general", name: "General Materials" };
-                    setSubjects([...realSubjects, generalSubject]);
+                    setSubjects(realSubjects);
                 }
             } else if (!semId && selectedSem) {
                 setSelectedSem(null);
@@ -77,10 +76,7 @@ export default function NotesBrowser() {
 
             // Sync Subject (Load Content)
             if (subId && selectedSub?.id !== subId) {
-                // If "general", we fabricate the object since it won't be in DB
-                let sub = subId === "general"
-                    ? { id: "general", name: "General Materials" }
-                    : await getSubjects(semId!).then(res => res.find(s => s.id === subId));
+                const sub = await getSubjects(semId!).then(res => res.find(s => s.id === subId));
 
                 if (sub) {
                     setSelectedSub(sub);
@@ -450,7 +446,7 @@ export default function NotesBrowser() {
                             </button>
                         )}
                         <h3 className={styles.notesTitle} style={{ margin: 0 }}>
-                            {selectedFolder ? selectedFolder.name : (selectedSub.name === "General Materials" ? "FILES" : `Materials for ${selectedSub.name}`)}
+                            {selectedFolder ? selectedFolder.name : `Materials for ${selectedSub.name}`}
                         </h3>
                     </div>