diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx
index e6a48ff..9cd64ec 100644
--- a/frontend/src/pages/Login.jsx
+++ b/frontend/src/pages/Login.jsx
@@ -1,87 +1,99 @@
-import { useState } from 'react';
-import { useNavigate, Link } from 'react-router-dom';
+import React, { useState, useEffect, useRef } from 'react';
+import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { useAuth } from '../context/AuthContext';
 import { authService } from '../services/authService';
 
 export default function Login() {
-    const [email, setEmail] = useState('');
-    const [password, setPassword] = useState('');
-    const [error, setError] = useState('');
-    const navigate = useNavigate();
-    const { login } = useAuth(); 
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [error, setError] = useState('');
+  const navigate = useNavigate();
+  const { login } = useAuth();
+  const [searchParams] = useSearchParams();
+  const googleLoginProcessed = useRef(false);
 
-    const handleSubmit = async (e) => {
-        e.preventDefault();
-        setError('');
+  useEffect(() => {
+    const token = searchParams.get('token');
+    
+    if (token && !googleLoginProcessed.current) {
+      googleLoginProcessed.current = true;
 
+      const url = new URL(window.location);
+      url.searchParams.delete('token');
+      window.history.replaceState({}, '', url);
+
+      const fetchUserAndLogin = async () => {
         try {
-            const data = await authService.login(email, password);
-            
-            const userData = {
-                id: data.user_id,
-                username: data.username,
-                email: email
-            };
-            
-            login(userData, data.token);
-            navigate('/');
+          localStorage.setItem('token', token);
+          
+          const realUserData = await authService.getCurrentUser();
+          
+          login({ user: realUserData, token });
+
+          navigate('/', { replace: true });
         } catch (err) {
-            setError(err.response?.data?.detail || 'Error al iniciar sesión. Revisa tus credenciales.');
+          console.error("Error al sincronizar perfil de Google:", err);
+          setError("Error de sincronización con Google. Inténtalo de nuevo.");
+          localStorage.removeItem('token'); 
         }
-    };
+      };
+
+      fetchUserAndLogin();
+    }
+  }, [searchParams, login, navigate]);
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    setError('');
+    try {
+      const userData = await authService.login(email, password);
+      login(userData);
+      navigate('/');
+    } catch (err) {
+      setError('Credenciales incorrectas.');
+    }
+  };
+
+  const handleGoogleLogin = () => {
+    window.location.href = "http://localhost:8000/api/auth/google/login";
+  };
 
   return (
-    <div className="flex justify-center mt-4 sm:mt-8">
-      <div className="max-w-md w-full bg-white rounded-2xl shadow-sm border border-slate-200 p-8">
+    <div className="flex-1 flex items-center justify-center py-4">
+      <div className="max-w-md w-full bg-white p-10 rounded-3xl shadow-sm border border-slate-200">
+        
         <div className="text-center mb-8">
-          <h2 className="text-3xl font-bold text-slate-800">Bienvenido</h2>
-          <p className="text-slate-500 mt-2">Inicia sesión para guardar tus espectros difusos</p>
+          <h2 className="text-3xl font-black text-slate-800 tracking-tight">Deck of Cards</h2>
+          <p className="text-slate-500 mt-2">Accede a tu panel de control</p>
         </div>
 
         {error && (
-          <div className="bg-red-50 text-red-600 p-3 rounded-lg mb-6 text-sm font-medium border border-red-200">
-            {error}
-          </div>
+          <div className="bg-red-50 text-red-600 p-4 rounded-2xl text-sm font-bold mb-6 border border-red-100 text-center">{error}</div>
         )}
 
-        <form onSubmit={handleSubmit} className="space-y-5">
-          <div>
-            <label className="block text-sm font-semibold text-slate-700 mb-1">Email</label>
-            <input 
-              type="email" 
-              required
-              autoComplete="email"
-              className="w-full px-4 py-2 border border-slate-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-all"
-              value={email}
-              onChange={(e) => setEmail(e.target.value)}
-              placeholder="tu@email.com"
-            />
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div className="space-y-1">
+            <label className="text-sm font-bold text-slate-700 ml-1">Email</label>
+            <input type="email" required value={email} onChange={(e) => setEmail(e.target.value)} className="w-full px-5 py-3 rounded-2xl border border-slate-200 focus:ring-2 focus:ring-blue-500 outline-none transition-all bg-slate-50 focus:bg-white" placeholder="correo@ejemplo.com" />
           </div>
-
-          <div>
-            <label className="block text-sm font-semibold text-slate-700 mb-1">Contraseña</label>
-            <input 
-              type="password" 
-              required
-              autoComplete="current-password"
-              className="w-full px-4 py-2 border border-slate-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:border-blue-500 outline-none transition-all"
-              value={password}
-              onChange={(e) => setPassword(e.target.value)}
-              placeholder="••••••••"
-            />
+          <div className="space-y-1">
+            <label className="text-sm font-bold text-slate-700 ml-1">Contraseña</label>
+            <input type="password" required value={password} onChange={(e) => setPassword(e.target.value)} className="w-full px-5 py-3 rounded-2xl border border-slate-200 focus:ring-2 focus:ring-blue-500 outline-none transition-all bg-slate-50 focus:bg-white" placeholder="••••••••" />
           </div>
-
-          <button 
-            type="submit" 
-            className="w-full py-3 bg-blue-600 text-white font-bold rounded-xl hover:bg-blue-700 transition-colors shadow-md mt-4"
-          >
-            Entrar
-          </button>
+          <button type="submit" className="w-full py-4 bg-blue-600 hover:bg-blue-700 text-white font-bold rounded-2xl transition-all shadow-sm active:scale-95 mt-2">Entrar</button>
         </form>
 
-        <p className="text-center mt-6 text-sm text-slate-600">
-          ¿No tienes cuenta? <Link to="/register" className="text-blue-600 font-bold hover:underline">Regístrate aquí</Link>
-        </p>
+        <div className="relative my-8">
+          <div className="absolute inset-0 flex items-center"><div className="w-full border-t border-slate-100"></div></div>
+          <div className="relative flex justify-center text-xs uppercase tracking-widest"><span className="px-3 bg-white text-slate-400 font-bold">O</span></div>
+        </div>
+
+        <button type="button" onClick={handleGoogleLogin} className="w-full flex items-center justify-center gap-3 px-4 py-4 border-2 border-slate-100 rounded-2xl bg-white text-slate-700 font-bold hover:bg-slate-50 hover:border-slate-200 transition-all shadow-sm active:scale-95">
+          <svg className="w-5 h-5" viewBox="0 0 24 24"><path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" fill="#4285F4" /><path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853" /><path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l2.85-2.22.81-.62z" fill="#FBBC05" /><path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335" /></svg>
+          Continuar con Google
+        </button>
+
+        <p className="mt-8 text-center text-sm text-slate-500 font-medium">¿Nuevo por aquí? <Link to="/register" className="text-blue-600 hover:underline font-extrabold">Crea una cuenta</Link></p>
       </div>
     </div>
   );
diff --git a/frontend/src/services/authService.js b/frontend/src/services/authService.js
index be72b64..f568a1d 100644
--- a/frontend/src/services/authService.js
+++ b/frontend/src/services/authService.js
@@ -9,5 +9,10 @@ export const authService = {
     register: async (username, email, password) => {
         const response = await api.post('/auth/register', { username, email, password });
         return response.data;
+    },
+
+    getCurrentUser: async () => {
+        const response = await api.get('/auth/me');
+        return response.data;
     }
 };
\ No newline at end of file