1 files changed, 13 insertions, 72 deletions

diff --git a/src/context/user.js b/src/context/user.js
index 23a3df4..4225201 100644
--- a/src/context/user.js
+++ b/src/context/user.js
@@ -1,23 +1,14 @@
 import { createContext, useContext, useEffect, useState } from 'react';
 import { useLocation } from 'react-router-dom';
+import { UserServiceProvider } from '../services/provider';
 import { useAuthState } from './auth';
-import {
-  getAllAssignments,
-  getAssignmentById,
-  getAssignmentsByClassId,
-  getClassroomAnnouncementsById,
-  getClassroomById,
-  getClassrooms,
-  getFaq,
-  getPeopleByClassId,
-  getUpcomingAssignmentsByClassId,
-} from '../services/user-service';
 
 const UserContext = createContext();
 
 function UserProvider(props) {
   const { user } = useAuthState();
   const { pathname } = useLocation();
+  const [userService, setUserService] = useState(null);
   const [state, setState] = useState({
     user: null,
     error: null,
@@ -26,73 +17,23 @@ function UserProvider(props) {
 
   useEffect(() => {
     setState({ user, pathname });
-  }, [user, pathname]);
-
-  const fetchClassrooms = () => getClassrooms(user.id);
-
-  const fetchAllAssignments = () => getAllAssignments(user.id);
-
-  const fetchAssignmentById = assignmentId => getAssignmentById(assignmentId);
-
-  const fetchAssignmentsByClassId = classId => getAssignmentsByClassId(classId);
 
-  const fetchClassroomById = classId => getClassroomById(classId);
-
-  const fetchFAQ = () => getFaq();
-
-  const fetchClassroomAnnouncements = classId =>
-    getClassroomAnnouncementsById(classId);
-
-  const fetchUpcomingAssignmentsByClassId = classId =>
-    getUpcomingAssignmentsByClassId(classId);
-
-  const fetchPeopleByClassId = classId => getPeopleByClassId(classId);
+    async function initUserService() {
+      if (user) {
+        const instance = await UserServiceProvider.getInstance(user);
+        setUserService(instance);
+      }
+    }
+    initUserService();
+  }, [user, pathname]);
 
-  return (
-    <UserContext.Provider
-      value={{
-        state,
-        fetchClassrooms,
-        fetchAllAssignments,
-        fetchAssignmentById,
-        fetchAssignmentsByClassId,
-        fetchClassroomById,
-        fetchFAQ,
-        fetchClassroomAnnouncements,
-        fetchUpcomingAssignmentsByClassId,
-        fetchPeopleByClassId,
-      }}
-      {...props}
-    />
-  );
+  return <UserContext.Provider value={{ state, userService }} {...props} />;
 }
 
 function useUser() {
-  const {
-    state,
-    fetchClassrooms,
-    fetchAssignmentById,
-    fetchAllAssignments,
-    fetchAssignmentsByClassId,
-    fetchClassroomById,
-    fetchFAQ,
-    fetchClassroomAnnouncements,
-    fetchUpcomingAssignmentsByClassId,
-    fetchPeopleByClassId,
-  } = useContext(UserContext);
+  const { state, userService } = useContext(UserContext);
 
-  return {
-    state,
-    fetchClassrooms,
-    fetchAllAssignments,
-    fetchAssignmentById,
-    fetchAssignmentsByClassId,
-    fetchClassroomById,
-    fetchFAQ,
-    fetchClassroomAnnouncements,
-    fetchUpcomingAssignmentsByClassId,
-    fetchPeopleByClassId,
-  };
+  return { state, userService };
 }
 
 export { UserProvider, useUser };