diff --git a/src/contexts/Events/EventProvider.tsx b/src/contexts/Events/EventProvider.tsx
index 8d0bbf3..715d99b 100644
--- a/src/contexts/Events/EventProvider.tsx
+++ b/src/contexts/Events/EventProvider.tsx
@@ -1,37 +1,3 @@
-/*import {useState} from 'react';
-import {EventContext} from "./EventContext";
-import getAllEvents from "../../utils/events/getAllEvents.js";
-import createEvent from "../../utils/events/createEvent.js";
-import deleteEvent from "../../utils/events/deleteEvent.js";
-
-
-export function EventProvider({ children }) {
-
-    const [events, setEvents] = useState([]);
-
-    const updateEvent = async () => {
-        const result = await getAllEvents();
-        setEvents(result.data.data);
-    }
-
-    const addEvent = async (name, description, start, end) => {
-        await createEvent(name, description, start, end);
-        await updateEvent();
-    }
-
-    const removeEvent = async (eventId) => {
-        const result = await deleteEvent(eventId);
-        await updateEvent();
-        return result;
-    }
-
-    return (
-        <EventContext.Provider value={{ events, updateEvent, addEvent, removeEvent }}>
-            {children}
-        </EventContext.Provider>
-    );
-}*/
-
 import { useState, ReactNode } from 'react';
 import { EventContext, EventGroup, EventContextType } from "./EventContext";
 import getAllEvents from "../../utils/events/getAllEvents";
diff --git a/src/pages/Admin/AdminPage.jsx b/src/pages/Admin/AdminPage.tsx
similarity index 79%
rename from src/pages/Admin/AdminPage.jsx
rename to src/pages/Admin/AdminPage.tsx
index 5765849..f6a0d83 100644
--- a/src/pages/Admin/AdminPage.jsx
+++ b/src/pages/Admin/AdminPage.tsx
@@ -3,17 +3,20 @@ import styles from "./AdminPage.module.css";
 import IncompleteEvents from "./components/IncompleteEvent/IncompleteEvent";
 import PendingMembers from "./components/PendingMembers/PendingMembers";
 import { AuthContext } from "../../contexts/Auth/AuthContext";
+import user from "../../interfaces/user.interface"
 import { useNavigate } from "react-router";
 import RegisterMember from "./components/RegisterMember/RegisterMember";
 
 
-function AdminPage() {
 
-    const { user } = useContext(AuthContext);
+function AdminPage() {
+    const authContext = useContext(AuthContext);
     const navigate = useNavigate();
 
-    if(!user.isAdmin) navigate("/");
-
+    if (!authContext?.user?.isAdmin) {
+        navigate("/");
+        return null; 
+    }
     return (
         <div className={styles.container}>
             <RegisterMember />