merge dev into toast branch

.github/_workflows/run-checks.yml → .github/workflows/run-checks.yml

@@ -2,9 +2,12 @@ name: Run Checks
 
 on:
   push:
-    branches: ["main"]
+    # branches: ["main"]
+    branches: ["dev"]
+
   pull_request:
-    branches: ["main"]
+    # branches: ["main"]
+    branches: ["dev"]
 
 jobs:
   run-checks:
@@ -22,7 +25,8 @@ jobs:
       - name: Install dependencies
         run:
           npm exec --workspaces -- npx rimraf node_modules && npx rimraf
-          node_modules && yarn install --frozen-lockfile
+          node_modules && yarn install
+          # node_modules && yarn install --frozen-lockfile
 
       - name: Build React project
         run: cd client && yarn run build

client/package.json

@@ -14,6 +14,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@chakra-ui/icons": "^2.0.0",
     "@chakra-ui/react": "^2.8.2",
     "@emotion/react": "^11.13.0",
     "@emotion/styled": "^11.13.0",
@@ -32,8 +33,8 @@
     "react-icons": "^5.3.0",
     "react-qr-code": "^2.0.15",
     "react-router-dom": "^6.26.1",
-    "zod": "^3.23.8",
-    "recharts": "^2.7.2"
+    "recharts": "^2.7.2",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@eslint/js": "^9.8.0",

client/src/App.tsx

@@ -16,8 +16,8 @@ import ClassDashboard, {
   OverallClassDashboard,
 } from "./components/dashboard/classDashboard/ClassDashboard";
 import ClassInfoDashboard from "./components/dashboard/classInfoDashboard/ClassInfoDashboard";
-import EventInfoDashboard from "./components/dashboard/eventInfoDashboard/EventInfoDashboard";
 import { Dashboard, DashboardHome } from "./components/dashboard/Dashboard";
+import EventInfoDashboard from "./components/dashboard/eventInfoDashboard/EventInfoDashboard";
 import SettingsDashboard from "./components/dashboard/settingsDashboard/SettingsDashboard";
 import { StudentDashboard } from "./components/dashboard/studentDashboard/StudentDashboard";
 import { StudentInfoDashboard } from "./components/dashboard/studentInfoDashboard/StudentInfoDashboard";
@@ -26,22 +26,22 @@ import { TeacherInfoDashboard } from "./components/dashboard/teacherInfoDashboar
 import { Discovery } from "./components/discovery/Discovery";
 import { CreateEvent } from "./components/forms/createEvent";
 import { Login } from "./components/login/Login";
-import { Landing } from "./components/signup/Landing";
 import { L } from "./components/logout/Logout";
 import { Playground } from "./components/playground/Playground";
 import { Profile } from "./components/profile/Profile";
 import { Settings } from "./components/profile/Settings";
 import { ProtectedRoute } from "./components/ProtectedRoute";
 import { Resources } from "./components/resources/Resources";
 import { Reviews } from "./components/reviews/Reviews";
+import { Landing } from "./components/signup/Landing";
 import { Signup } from "./components/signup/Signup";
 import Request from "./components/teacher-signup/requests/Request";
 import { TeacherSignup } from "./components/teacher-signup/TeacherSignup";
 import { AuthProvider } from "./contexts/AuthContext";
 import { BackendProvider } from "./contexts/BackendContext";
 import { RoleProvider } from "./contexts/RoleContext";
-import { ForgotPasswordConfirmation } from "./utils/auth/ForgotPasswordConfirmation"
 import { ForgotPassword } from "./utils/auth/ForgotPassword";
+import { ForgotPasswordConfirmation } from "./utils/auth/ForgotPasswordConfirmation";
 
 const App = () => {
   return (

client/src/components/CatchAll.tsx

@@ -6,7 +6,8 @@ export const CatchAll = () => {
   const navigate = useNavigate();
 
   useEffect(() => {
-    navigate("/dashboard");
+    // navigate("/dashboard");
+    navigate("/profile");
   }, [navigate]);
 
   return <p>Route not found... redirecting...</p>;

client/src/components/ProtectedRoute.tsx

@@ -20,7 +20,8 @@ export const ProtectedRoute = ({
   return currentUser && isValidRole ? (
     element
   ) : currentUser ? (
-    <Navigate to={"/dashboard"} />
+    // <Navigate to={"/dashboard"} />
+    <Navigate to={"/profile"} />
   ) : (
     <Navigate to={"/"} />
   );