Index: frontend/src/pages/Signup-Login/LoginPage.jsx
===================================================================
--- frontend/src/pages/Signup-Login/LoginPage.jsx	(revision 4c3dc5a1f8b831c6cade3197c701ca91379202a5)
+++ frontend/src/pages/Signup-Login/LoginPage.jsx	(revision a94fd9e8dc0b7e5b6336ed1783296b4f8e89ad9e)
@@ -10,9 +10,14 @@
     const navigate = useNavigate();
 
+    const [pendingToken, setPendingToken] = useState(null);
+    const [linkUsername, setLinkUsername] = useState('');
+    const [linkPassword, setLinkPassword] = useState('');
+    const [showLinkModal, setShowLinkModal] = useState(false);
+
     const login = async () => {
         const response = await fetch('http://localhost:8080/api/auth/authenticate', {
             method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ username, password })
+            headers: {'Content-Type': 'application/json'},
+            body: JSON.stringify({username, password})
         });
 
@@ -29,5 +34,5 @@
         //decode
         try {
-            const { jwtDecode } = await import('jwt-decode');
+            const {jwtDecode} = await import('jwt-decode');
             const decoded = jwtDecode(token);
             localStorage.setItem('username', decoded.sub); // sub contains usernamere
@@ -63,16 +68,20 @@
 
 
-
-
-
-
+//google
     const handleGoogleLogin = async (credentialResponse) => {
         try {
-            const token = credentialResponse.credential; // ID token
+            const token = credentialResponse.credential; // id_token
             const res = await fetch('http://localhost:8080/api/auth/google', {
                 method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ credential: token })
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({credential: token})
             });
+
+            if (res.status === 409) {
+                const data = await res.json();
+                setPendingToken(data.pendingToken);
+                setShowLinkModal(true);
+                return;
+            }
 
             if (!res.ok) {
@@ -84,5 +93,5 @@
             const data = await res.json();
             localStorage.setItem('accessToken', data.token);
-            alert('Google login successful!');
+            // redirect
             navigate('/dashboard');
         } catch (err) {
@@ -92,4 +101,37 @@
     };
 
+// confirm linking
+    const confirmLink = async (e) => {
+        e.preventDefault();
+        try {
+            const res = await fetch('http://localhost:8080/api/auth/link/confirm', {
+                method: 'POST',
+                headers: {'Content-Type': 'application/json'},
+                body: JSON.stringify({
+                    pendingToken,
+                    username: linkUsername,
+                    password: linkPassword
+                })
+            });
+
+            const data = await res.json().catch(() => ({}));
+
+            if (!res.ok) {
+                console.log("vo res.ok paga")
+                const msg = data.message || 'link confirm failed';
+                alert(msg);
+                return;
+            }
+
+            localStorage.setItem('accessToken', data.token);
+            setShowLinkModal(false);
+            navigate('/dashboard');
+        } catch (err) {
+            console.log("vo posleden paga")
+            console.error(err);
+            alert('Link confirm failed');
+        }
+    };
+
     return (
 
@@ -97,17 +139,17 @@
         <div>
 
-                <nav className="flex items-center justify-between px-8 py-6">
-                    <div className="flex items-center space-x-2">
-                        <span className="text-2xl font-bold">Trading<span className="text-blue-400">MK</span></span>
-                    </div>
-                    <button
-                        className="border border-green-400 text-green-400 px-6 py-2 rounded-full hover:bg-green-400 hover:text-black transition-all duration-300 cursor-pointer"
-                        onClick={() => navigate('/')}
-                    >
-                        Back
-                    </button>
-                </nav>
-
-                <div className="max-w-md mx-auto mt-10 p-6 bg-white rounded shadow">
+            <nav className="flex items-center justify-between px-8 py-6">
+                <div className="flex items-center space-x-2">
+                    <span className="text-2xl font-bold">Trading<span className="text-blue-400">MK</span></span>
+                </div>
+                <button
+                    className="border border-green-400 text-green-400 px-6 py-2 rounded-full hover:bg-green-400 hover:text-black transition-all duration-300 cursor-pointer"
+                    onClick={() => navigate('/')}
+                >
+                    Back
+                </button>
+            </nav>
+
+            <div className="max-w-md mx-auto mt-10 p-6 bg-white rounded shadow">
                 <h2 className="text-2xl mb-4 font-semibold">Log In</h2>
                 <form onSubmit={handleLogin} className="space-y-4">
@@ -135,15 +177,66 @@
                 {success && <p className="text-green-600 mt-4">{success}</p>}
 
-                    <div className="max-w-md mx-auto mt-10 p-6 bg-white rounded shadow text-center">
-                        <h2 className="text-2xl mb-4 font-semibold">Login with Google</h2>
-                        <GoogleLogin
-                            onSuccess={handleGoogleLogin}
-                            onError={() => {
-                                console.log('Login Failed');
-                            }}
-                        />
+                <div className="max-w-md mx-auto mt-10 p-6 bg-white rounded shadow text-center">
+                    <h2 className="text-2xl mb-4 font-semibold">Login with Google</h2>
+                    <GoogleLogin
+                        onSuccess={handleGoogleLogin}
+                        onError={() => {
+                            console.log('Login Failed');
+                        }}
+                    />
+                </div>
+            </div>
+
+
+            {showLinkModal && (
+                <div className="fixed inset-0 bg-black/30 backdrop-blur-sm flex items-center justify-center z-50">
+                    <div className="bg-white rounded-2xl shadow-xl p-8 w-full max-w-md animate-fadeIn">
+                        <h3 className="text-xl font-semibold text-gray-800 mb-4">
+                            Поврзување со постоечки акаунт
+                        </h3>
+                        <p className="text-gray-600 mb-6">
+                            Внесете го вашето <span className="font-medium">корисничко име</span> и
+                            <span className="font-medium"> лозинка</span> за да ги поврзете Google податоците.
+                        </p>
+
+                        <form onSubmit={confirmLink} className="space-y-4">
+                            <input
+                                value={linkUsername}
+                                onChange={(e) => setLinkUsername(e.target.value)}
+                                placeholder="Username"
+                                className="w-full p-3 border rounded-lg focus:ring-2 focus:ring-blue-400"
+                                required
+                            />
+                            <input
+                                value={linkPassword}
+                                onChange={(e) => setLinkPassword(e.target.value)}
+                                type="password"
+                                placeholder="Password"
+                                className="w-full p-3 border rounded-lg focus:ring-2 focus:ring-blue-400"
+                                required
+                            />
+
+                            <div className="flex justify-end space-x-3 pt-4">
+                                <button
+                                    type="button"
+                                    onClick={() => {
+                                        setShowLinkModal(false);
+                                        setPendingToken(null);
+                                    }}
+                                    className="px-4 py-2 rounded-lg border border-gray-300 text-gray-700 hover:bg-gray-100"
+                                >
+                                    Cancel
+                                </button>
+                                <button
+                                    type="submit"
+                                    className="px-4 py-2 rounded-lg bg-blue-600 text-white hover:bg-blue-700"
+                                >
+                                    Confirm & Link
+                                </button>
+                            </div>
+                        </form>
                     </div>
-            </div>
-
+                </div>
+            )}