Merge pull request #167 from UNLV-CS472-672/login-prompt-questions

7th PR: Add Role-Based Questionnaire Flow Post-Login

Author: FrankFurter123

frontend/package-lock.json

@@ -14,6 +14,7 @@
     "axios": "^1.8.4",
     "bootstrap": "^5.3.3",
     "bootstrap-icons": "^1.11.3",
+    "canvas-confetti": "^1.9.3",
     "emoji-picker-react": "^4.12.2",
     "react": "^19.0.0",
     "react-calendar": "^5.1.0",

frontend/package.json

@@ -4,6 +4,7 @@ import Header from "./Components/Header.jsx";
 import Footer from "./Components/Footer.jsx";
 import StudentLayout from "./Components/StudentLayout.jsx";
 
+
 // Components
 import Home from "./components/Home.jsx";
 import About from "./components/About.jsx";
@@ -25,29 +26,29 @@ import Calendar from "./Components/Calendar.jsx";
 import Inbox from "./Components/Inbox.jsx";
 import TutorView from "./Components/TutorView.jsx";
 import AssignmentPage from "./Components/AssignmentPage.jsx";
-
-import AssignmentCreate from "./Components/AssignmentCreate.jsx";
-
 import WhiteboardCanvas from "./Components/WhiteboardCanvas.jsx";
 import LandingPage from "./Components/LandingPage.jsx";
-
 import Settings from "./Components/Settings.jsx";
-
+import Questionnaire from "./Components/Questionnaire.jsx";
+import AssignmentCreate from "./Components/AssignmentCreate.jsx";
 
 
 function App() {
     const location = useLocation();
 
+
     useEffect(() => {
         window.scrollTo(0, 0);
     }, [location]);
 
+
     return (
         <div className="App">
             {(location.pathname !== "/login" && location.pathname !== "/dateofbirth" && location.pathname !== "/SignUp" &&
                 location.pathname !== "/StudentView" && location.pathname !== "/calendar" &&
                 location.pathname !== "/chat" && location.pathname !== "/videocall" && location.pathname !== "/tutorview") && <Header />}
 
+
             <Routes>
                 {/* Public Routes */}
                 <Route path="/" element={<Home />} />
@@ -64,18 +65,12 @@ function App() {
                 <Route path="/faqs" element={<FAQS />} />
                 <Route path="/findTutor" element={<FindTutor />} />
                 <Route path="/chat" element={<Chat />} />
+                <Route path="/WhiteboardCanvas" element={<WhiteboardCanvas />} />
 
-                <Route path="/videocall" element={<VideoCall />} />
-                {/* <Route path="/Calendar" element={<Calendar />} /> */}
-
-                {/* Jose needs this for this tutorView and inbox to work */}
-                <Route path="/tutorview" element={<TutorView />} />
-                <Route path="/Calendar" element={<Calendar />} />
-                <Route path="/Inbox" element={<Inbox />} />
-                <Route path="/tutorview" element={<TutorView />} />
-                <Route path="/assignment_create" element={<AssignmentCreate />} />
 
-                <Route path="/WhiteboardCanvas" element={<WhiteboardCanvas/>} />
+                {/* Profile Setup Routes */}
+                <Route path="/student-questionnaire" element={<Questionnaire userRole={3} />} />
+                <Route path="/tutor-questionnaire" element={<Questionnaire userRole={1} />} />
 
 
                 {/* Student Routes with Layout */}
@@ -93,17 +88,12 @@ function App() {
                 <Route path="/student/learn_more" element={<StudentLayout><Learn_more /></StudentLayout>} />
                 <Route path="/student/about" element={<StudentLayout><About /></StudentLayout>} />
                 <Route path="/student/assignment" element={<StudentLayout><AssignmentPage /></StudentLayout>} />
-
-                {/*<Route path="/student/assignment_create" element={<StudentLayout><AssignmentCreate /></StudentLayout>} />*/}
-                {/*<Route path="/student/settings" element={<StudentLayout><Settings /></StudentLayout>} />*/}
-                {/*<Route path="/student/lessons" element={<StudentLayout><Lessons /></StudentLayout>} />*/}
-                {/*<Route path="/student/resources" element={<StudentLayout><Resources /></StudentLayout>} />*/}
-
                 <Route path="/student/settings" element={<StudentLayout><Settings /></StudentLayout>} />
                 <Route path="/student/inbox" element={<StudentLayout><Inbox /></StudentLayout>} />
                 <Route path="/student/WhiteboardCanvas" element={<StudentLayout><WhiteboardCanvas /></StudentLayout>} />
                 <Route path="/student/LandingPage" element={<StudentLayout><LandingPage /></StudentLayout>} />
 
+
                 {/* Tutor Routes with Layout */}
                 <Route path="/tutor/view" element={<StudentLayout><TutorView /></StudentLayout>} />
                 <Route path="/tutor/calendar" element={<StudentLayout><Calendar /></StudentLayout>} />
@@ -123,11 +113,15 @@ function App() {
                 <Route path="/tutor/inbox" element={<StudentLayout><Inbox /></StudentLayout>} />
                 <Route path="/tutor/WhiteboardCanvas" element={<StudentLayout><WhiteboardCanvas /></StudentLayout>} />
                 <Route path="/tutor/LandingPage" element={<StudentLayout><LandingPage /></StudentLayout>} />
+                <Route path="/tutor/assignment_create" element={<StudentLayout><AssignmentCreate /></StudentLayout>} />
 
             </Routes>
+
+
             {(location.pathname !== "/login" && location.pathname !== "/dateofbirth" && location.pathname !== "/SignUp") && <Footer />}
         </div>
     );
 }
 
-export default App;
+
+export default App;