diff --git a/app/routes/login.tsx b/app/routes/login.tsx
index 639632f..6207898 100644
--- a/app/routes/login.tsx
+++ b/app/routes/login.tsx
@@ -1,16 +1,73 @@
-"use client"
-
-import { Link } from "react-router";
-import { useNavigate } from "react-router";
+import { useState, useEffect } from "react"
+import { Link, useNavigate } from "react-router"
 import { FormInput } from "@/components/shared/form-input"
 import { FormButton } from "@/components/shared/form-button"
+import { useAuth } from "@/app/context/auth-context"
+import { setTokens } from "@/lib/auth"
 
 export default function LoginPage() {
-  const navigate = useNavigate();
+  const navigate = useNavigate()
+  const { user, loading: authLoading, refreshUser } = useAuth()
 
-  function handleSubmit(e: React.FormEvent) {
+  useEffect(() => {
+    if (!authLoading && user) {
+      navigate("/forms")
+    }
+  }, [user, authLoading, navigate])
+
+  const [form, setForm] = useState({ email: "", password: "" })
+  const [rememberMe, setRememberMe] = useState(false)
+  const [errors, setErrors] = useState<Partial<typeof form & { general: string }>>({})
+  const [loading, setLoading] = useState(false)
+
+  function handleChange(e: React.ChangeEvent<HTMLInputElement>) {
+    setForm((prev) => ({ ...prev, [e.target.name]: e.target.value }))
+    setErrors((prev) => ({ ...prev, [e.target.name]: "" }))
+  }
+
+  function validate() {
+    const newErrors: Partial<typeof form> = {}
+    if (!form.email.trim()) newErrors.email = "Email is required"
+    if (!form.password) newErrors.password = "Password is required"
+    return newErrors
+  }
+
+  async function handleSubmit(e: React.FormEvent) {
     e.preventDefault()
-    navigate("/forms")
+    const newErrors = validate()
+    if (Object.keys(newErrors).length > 0) {
+      setErrors(newErrors)
+      return
+    }
+
+    setLoading(true)
+    try {
+      const res = await fetch("http://localhost:8080/api/auth/login", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({
+          email: form.email,
+          password: form.password,
+        }),
+      })
+
+      if (!res.ok) {
+        const data = await res.json()
+        setErrors({ general: data.message ?? "Invalid email or password" })
+        return
+      }
+
+      const data = await res.json()
+      setTokens(data.access_token, data.refresh_token, rememberMe)
+      refreshUser()
+
+      navigate("/forms")
+    } catch (err) {
+      console.error(err)
+      setErrors({ general: "Something went wrong. Please try again." })
+    } finally {
+      setLoading(false)
+    }
   }
 
   return (
@@ -28,25 +85,41 @@ export default function LoginPage() {
 
           <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
             <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+              {errors.general && (
+                <p className="rounded-lg bg-destructive/10 px-3 py-2 text-sm text-destructive">
+                  {errors.general}
+                </p>
+              )}
+
               <FormInput
                 label="Email"
                 type="email"
+                name="email"
                 placeholder="bagas@example.com"
                 required
                 autoComplete="email"
+                value={form.email}
+                onChange={handleChange}
+                error={errors.email}
               />
               <FormInput
                 label="Password"
                 type="password"
+                name="password"
                 placeholder="Enter your password"
                 required
                 autoComplete="current-password"
+                value={form.password}
+                onChange={handleChange}
+                error={errors.password}
               />
 
               <div className="flex items-center justify-between">
                 <label className="flex items-center gap-2 text-sm text-muted-foreground">
                   <input
                     type="checkbox"
+                    checked={rememberMe}
+                    onChange={(e) => setRememberMe(e.target.checked)}
                     className="h-4 w-4 rounded border-input accent-primary"
                   />
                   Remember me
@@ -59,12 +132,15 @@ export default function LoginPage() {
                 </Link>
               </div>
 
-              <FormButton type="submit" size="lg" className="mt-2 w-full">
-                Sign in
+              <FormButton
+                type="submit"
+                size="lg"
+                className="mt-2 w-full"
+                disabled={loading}
+              >
+                {loading ? "Signing in..." : "Sign in"}
               </FormButton>
             </form>
-
-
           </div>
 
           <p className="mt-6 text-center text-sm text-muted-foreground">
@@ -80,4 +156,4 @@ export default function LoginPage() {
       </div>
     </div>
   )
-}
+}
\ No newline at end of file
diff --git a/app/routes/register.tsx b/app/routes/register.tsx
index 5fae3fe..af53515 100644
--- a/app/routes/register.tsx
+++ b/app/routes/register.tsx
@@ -1,93 +1,172 @@
-"use client"
-
-import { Link } from "react-router";
-import { useNavigate } from "react-router";
+import { useState, useEffect } from "react"
+import { Link, useNavigate } from "react-router"
 import { FormInput } from "@/components/shared/form-input"
 import { FormButton } from "@/components/shared/form-button"
+import { useAuth } from "@/app/context/auth-context"
 
 export default function RegisterPage() {
-  const navigate = useNavigate();
+    const navigate = useNavigate()
+    const { user, loading: authLoading } = useAuth()
 
-  function handleSubmit(e: React.FormEvent) {
-    e.preventDefault()
-    navigate("/forms")
-  }
+    useEffect(() => {
+        if (!authLoading && user) {
+            navigate("/forms")
+        }
+    }, [user, authLoading, navigate])
 
-  return (
-    <div className="flex min-h-screen flex-col bg-background">
-      <div className="flex flex-1 items-center justify-center px-4 py-12">
-        <div className="w-full max-w-md">
-          <div className="mb-8 flex flex-col items-center gap-3">
-            <h1 className="text-2xl font-bold text-foreground">
-              Create your account
-            </h1>
-            <p className="text-sm text-muted-foreground">
-              Start building beautiful forms in minutes
-            </p>
-          </div>
+    const [form, setForm] = useState({
+        firstName: "",
+        lastName: "",
+        email: "",
+        password: "",
+        confirmPassword: "",
+    })
 
-          <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
-            <form onSubmit={handleSubmit} className="flex flex-col gap-4">
-              <div className="flex gap-3">
-                <FormInput
-                  label="First name"
-                  type="text"
-                  placeholder="bagas"
-                  required
-                  autoComplete="given-name"
-                  className="w-full"
-                />
-                <FormInput
-                  label="Last name"
-                  type="text"
-                  placeholder="pacil"
-                  required
-                  autoComplete="family-name"
-                  className="w-full"
-                />
-              </div>
-              <FormInput
-                label="Email"
-                type="email"
-                placeholder="bagas@example.com"
-                required
-                autoComplete="email"
-              />
-              <FormInput
-                label="Password"
-                type="password"
-                placeholder="Create a password"
-                required
-                hint="Must be at least 8 characters"
-                autoComplete="new-password"
-              />
-              <FormInput
-                label="Confirm password"
-                type="password"
-                placeholder="Confirm your password"
-                required
-                autoComplete="new-password"
-              />
+    const [errors, setErrors] = useState<Partial<typeof form>>({})
 
-              <FormButton type="submit" size="lg" className="mt-2 w-full">
-                Create account
-              </FormButton>
-            </form>
+    function handleChange(e: React.ChangeEvent<HTMLInputElement>) {
+        setForm((prev) => ({ ...prev, [e.target.name]: e.target.value }))
+        setErrors((prev) => ({ ...prev, [e.target.name]: "" }))
+    }
 
+    function validate() {
+        const newErrors: Partial<typeof form> = {}
 
-          </div>
+        if (!form.firstName.trim()) newErrors.firstName = "First name is required"
+        if (!form.lastName.trim()) newErrors.lastName = "Last name is required"
+        if (!form.email.trim()) newErrors.email = "Email is required"
+        if (form.password.length < 8)
+            newErrors.password = "Must be at least 8 characters"
+        if (form.confirmPassword !== form.password)
+            newErrors.confirmPassword = "Passwords do not match"
 
-          <p className="mt-6 text-center text-sm text-muted-foreground">
-            Already have an account?{" "}
-            <Link
-              to="/login"
-              className="font-medium text-primary hover:underline"
-            >
-              Sign in
-            </Link>
-          </p>
+        return newErrors
+    }
+
+    async function handleSubmit(e: React.FormEvent) {
+        e.preventDefault()
+        const newErrors = validate()
+        if (Object.keys(newErrors).length > 0) {
+            setErrors(newErrors)
+            return
+        }
+
+        try {
+            const res = await fetch("http://localhost:8080/api/auth/register", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({
+                    email: form.email,
+                    password: form.password,
+                }),
+            })
+
+            if (!res.ok) {
+                const data = await res.json()
+                setErrors({ email: data.message ?? "Registration failed" })
+                return
+            }
+
+            navigate("/login")
+        } catch (err) {
+            console.error(err)
+            setErrors({ email: "Something went wrong. Please try again." })
+        }
+    }
+
+    return (
+        <div className="flex min-h-screen flex-col bg-background">
+            <div className="flex flex-1 items-center justify-center px-4 py-12">
+                <div className="w-full max-w-md">
+                    <div className="mb-8 flex flex-col items-center gap-3">
+                        <h1 className="text-2xl font-bold text-foreground">
+                            Create your account
+                        </h1>
+                        <p className="text-sm text-muted-foreground">
+                            Start building beautiful forms in minutes
+                        </p>
+                    </div>
+
+                    <div className="rounded-xl border border-border bg-card p-6 shadow-sm">
+                        <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+                            <div className="flex gap-3">
+                                <FormInput
+                                    label="First name"
+                                    type="text"
+                                    name="firstName"
+                                    placeholder="bagas"
+                                    required
+                                    autoComplete="given-name"
+                                    className="w-full"
+                                    value={form.firstName}
+                                    onChange={handleChange}
+                                    error={errors.firstName}
+                                />
+                                <FormInput
+                                    label="Last name"
+                                    type="text"
+                                    name="lastName"
+                                    placeholder="pacil"
+                                    required
+                                    autoComplete="family-name"
+                                    className="w-full"
+                                    value={form.lastName}
+                                    onChange={handleChange}
+                                    error={errors.lastName}
+                                />
+                            </div>
+                            <FormInput
+                                label="Email"
+                                type="email"
+                                name="email"
+                                placeholder="bagas@example.com"
+                                required
+                                autoComplete="email"
+                                value={form.email}
+                                onChange={handleChange}
+                                error={errors.email}
+                            />
+                            <FormInput
+                                label="Password"
+                                type="password"
+                                name="password"
+                                placeholder="Create a password"
+                                required
+                                hint="Must be at least 8 characters"
+                                autoComplete="new-password"
+                                value={form.password}
+                                onChange={handleChange}
+                                error={errors.password}
+                            />
+                            <FormInput
+                                label="Confirm password"
+                                type="password"
+                                name="confirmPassword"
+                                placeholder="Confirm your password"
+                                required
+                                autoComplete="new-password"
+                                value={form.confirmPassword}
+                                onChange={handleChange}
+                                error={errors.confirmPassword}
+                            />
+
+                            <FormButton type="submit" size="lg" className="mt-2 w-full">
+                                Create account
+                            </FormButton>
+                        </form>
+                    </div>
+
+                    <p className="mt-6 text-center text-sm text-muted-foreground">
+                        Already have an account?{" "}
+                        <Link
+                            to="/login"
+                            className="font-medium text-primary hover:underline"
+                        >
+                            Sign in
+                        </Link>
+                    </p>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-  )
-}
+    )
+}
\ No newline at end of file