diff --git a/src/contexts/AuthContext.jsx b/src/contexts/AuthContext.jsx
index 586dc57..e0581a2 100644
--- a/src/contexts/AuthContext.jsx
+++ b/src/contexts/AuthContext.jsx
@@ -1,9 +1,8 @@
-import {
+import React, {
   createContext,
   useContext,
   useState,
   useEffect,
-  useCallback,
 } from "react";
 import {
   supabase,
@@ -16,126 +15,145 @@ import {
 
 const AuthContext = createContext();
 
-export function useAuth() {
+export const useAuth = () => {
   const context = useContext(AuthContext);
   if (!context) {
     throw new Error("useAuth must be used within an AuthProvider");
   }
   return context;
-}
+};
 
-export function AuthProvider({ children }) {
+export const AuthProvider = ({ children }) => {
   const [currentUser, setCurrentUser] = useState(null);
   const [userProfile, setUserProfile] = useState(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(null);
 
-  const signup = useCallback(async (email, password, username) => {
-    try {
-      setError(null);
-      const result = await supabaseSignUp(email, password, username);
-      return result;
-    } catch (error) {
-      const errorMessage = error.message || "Failed to sign up";
-      setError(errorMessage);
-      throw error;
-    }
-  }, []);
-
-  const login = useCallback(async (email, password) => {
-    try {
-      setError(null);
-      const result = await supabaseSignIn(email, password);
-      return result;
-    } catch (error) {
-      const errorMessage = error.message || "Failed to log in";
-      setError(errorMessage);
-      throw error;
-    }
-  }, []);
-
-  const logout = useCallback(async () => {
-    try {
-      setError(null);
-      await supabaseSignOut();
-      setCurrentUser(null);
-      setUserProfile(null);
-    } catch (error) {
-      const errorMessage = error.message || "Failed to log out";
-      setError(errorMessage);
-      throw error;
-    }
-  }, []);
-
-  const fetchUserProfile = useCallback(async (uid) => {
-    if (!uid) return null;
-    try {
-      setError(null);
-      return await getUserProfile(uid);
-    } catch (error) {
-      const errorMessage = error.message || "Failed to fetch user profile";
-      setError(errorMessage);
-      return null;
-    }
-  }, []);
-
   useEffect(() => {
-    let authSubscription;
-
-    const initializeAuth = async () => {
+    // Проверяем текущую сессию при загрузке
+    const checkSession = async () => {
       try {
-        setError(null);
-        const user = await getCurrentUser();
-        if (user) {
-          setCurrentUser(user);
-          const profile = await fetchUserProfile(user.id);
+        const { data: { session }, error: sessionError } = await supabase.auth.getSession();
+        if (sessionError) throw sessionError;
+
+        if (session?.user) {
+          setCurrentUser(session.user);
+          // Загружаем профиль пользователя
+          const { data: profile, error: profileError } = await supabase
+            .from('users')
+            .select('*')
+            .eq('id', session.user.id)
+            .single();
+          
+          if (profileError) throw profileError;
           setUserProfile(profile);
         }
-
-        const {
-          data: { subscription },
-        } = supabase.auth.onAuthStateChange(async (event, session) => {
-          if (session?.user) {
-            setCurrentUser(session.user);
-            const profile = await fetchUserProfile(session.user.id);
-            setUserProfile(profile);
-          } else {
-            setCurrentUser(null);
-            setUserProfile(null);
-          }
-        });
-        authSubscription = subscription;
-      } catch (error) {
-        const errorMessage = error.message || "Failed to initialize auth";
-        setError(errorMessage);
+      } catch (err) {
+        console.error('Error checking session:', err);
+        setError('Ошибка проверки сессии');
       } finally {
         setLoading(false);
       }
     };
 
-    initializeAuth();
+    checkSession();
+
+    // Подписываемся на изменения состояния авторизации
+    const { data: { subscription } } = supabase.auth.onAuthStateChange(async (event, session) => {
+      if (event === 'SIGNED_IN' && session?.user) {
+        setCurrentUser(session.user);
+        try {
+          const { data: profile, error: profileError } = await supabase
+            .from('users')
+            .select('*')
+            .eq('id', session.user.id)
+            .single();
+          
+          if (profileError) throw profileError;
+          setUserProfile(profile);
+        } catch (err) {
+          console.error('Error loading user profile:', err);
+          setError('Ошибка загрузки профиля');
+        }
+      } else if (event === 'SIGNED_OUT') {
+        setCurrentUser(null);
+        setUserProfile(null);
+      }
+    });
 
     return () => {
-      if (authSubscription) {
-        authSubscription.unsubscribe();
-      }
+      subscription.unsubscribe();
     };
-  }, [fetchUserProfile]);
+  }, []);
+
+  const signIn = async (email, password) => {
+    try {
+      setError(null);
+      const { data, error } = await supabase.auth.signInWithPassword({
+        email,
+        password
+      });
+      
+      if (error) throw error;
+      return data;
+    } catch (err) {
+      console.error('Error signing in:', err);
+      setError(err.message || 'Ошибка входа');
+      throw err;
+    }
+  };
+
+  const signUp = async (email, password, username) => {
+    try {
+      setError(null);
+      const { data, error } = await supabase.auth.signUp({
+        email,
+        password,
+        options: {
+          data: { username }
+        }
+      });
+      
+      if (error) throw error;
+      return data;
+    } catch (err) {
+      console.error('Error signing up:', err);
+      setError(err.message || 'Ошибка регистрации');
+      throw err;
+    }
+  };
+
+  const signOut = async () => {
+    try {
+      setError(null);
+      const { error } = await supabase.auth.signOut();
+      if (error) throw error;
+      setCurrentUser(null);
+      setUserProfile(null);
+    } catch (err) {
+      console.error('Error signing out:', err);
+      setError('Ошибка при выходе');
+      throw err;
+    }
+  };
 
   const value = {
     currentUser,
     userProfile,
-    signup,
-    login,
-    logout,
     loading,
     error,
-    updateProfile: fetchUserProfile,
+    signIn,
+    signUp,
+    signOut
   };
 
+  if (loading) {
+    return <div className="flex justify-center items-center h-screen">Загрузка...</div>;
+  }
+
   return (
     <AuthContext.Provider value={value}>
-      {!loading && children}
+      {children}
     </AuthContext.Provider>
   );
-}
+};