Index: imaps-frontend/src/pages/Signup/Signup.jsx
===================================================================
--- imaps-frontend/src/pages/Signup/Signup.jsx	(revision 0c6b92add4cfaedcb91bcd37b45849f142f7d152)
+++ imaps-frontend/src/pages/Signup/Signup.jsx	(revision 79a03170cdde4e801d12257ee86723774970427b)
@@ -4,4 +4,5 @@
 import styles from "./Signup.module.css";
 import Logo from "../../components/Logo/Logo";
+import netconfig from "../../scripts/net/netconfig.js";
 
 export default function Signup() {
@@ -9,10 +10,17 @@
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
   const [message, setMessage] = useState("");
-  const [messageType, setMessageType] = useState(""); // New state to manage message type
+  const [messageType, setMessageType] = useState("");
   const navigate = useNavigate();
 
   const handleSubmit = async (e) => {
     e.preventDefault();
+
+    if (password !== confirmPassword) {
+      setMessageType("error");
+      setMessage("Passwords do not match.");
+      return;
+    }
 
     const payload = {
@@ -23,5 +31,5 @@
 
     try {
-      const response = await fetch("http://localhost:8080/api/auth/register", {
+      const response = await fetch(netconfig.auth.register, {
         method: "POST",
         headers: {
@@ -35,8 +43,7 @@
         setMessage("User registered successfully!");
 
-        // Wait 3 seconds and then redirect to login page
         setTimeout(() => {
           navigate("/login");
-        }, 3000);
+        }, 1000);
       } else if (response.status === 409) {
         setMessageType("error");
@@ -54,62 +61,68 @@
 
   return (
-    <div className={styles.wrapper}>
-      <Logo></Logo>
-      <div className={styles.illustration}>
-        <img src={illustration} alt="illustration" />
+      <div className={styles.wrapper}>
+        <Logo></Logo>
+        <div className={styles.illustration}>
+          <img src={illustration} alt="illustration" />
+        </div>
+        <div className={styles.form}>
+          <div className={styles.heading}>CREATE AN ACCOUNT</div>
+          <form onSubmit={handleSubmit}>
+            <div>
+              <label htmlFor="name">Username</label>
+              <input
+                  type="text"
+                  id="name"
+                  value={name}
+                  onChange={(e) => setName(e.target.value)}
+                  placeholder="Enter your username"
+                  required
+              />
+            </div>
+            <div>
+              <label htmlFor="email">E-Mail</label>
+              <input
+                  type="email"
+                  id="email"
+                  value={email}
+                  onChange={(e) => setEmail(e.target.value)}
+                  placeholder="Enter your email"
+                  required
+              />
+            </div>
+            <div>
+              <label htmlFor="password">Password</label>
+              <input
+                  type="password"
+                  id="password"
+                  value={password}
+                  onChange={(e) => setPassword(e.target.value)}
+                  placeholder="Enter your password"
+                  required
+              />
+            </div>
+            <div>
+              <label htmlFor="confirmPassword">Confirm Password</label>
+              <input
+                  type="password"
+                  id="confirmPassword"
+                  value={confirmPassword}
+                  onChange={(e) => setConfirmPassword(e.target.value)}
+                  placeholder="Confirm your password"
+                  required
+              />
+            </div>
+            <button type="submit">Submit</button>
+            {message && (
+                <p className={messageType === "success" ? styles.successMessage : styles.errorMessage}>
+                  {message}
+                </p>
+            )}
+          </form>
+          <p>
+            Have an account? <Link to="/Login"> Login </Link>
+          </p>
+        </div>
       </div>
-      <div className={styles.form}>
-        <div className={styles.heading}>CREATE AN ACCOUNT</div>
-        <form onSubmit={handleSubmit}>
-          <div>
-            <label htmlFor="name">Username</label>
-            <input
-              type="text"
-              id="name"
-              value={name}
-              onChange={(e) => setName(e.target.value)}
-              placeholder="Enter your username"
-              required
-            />
-          </div>
-          <div>
-            <label htmlFor="email">E-Mail</label>
-            <input
-              type="email"
-              id="email"
-              value={email}
-              onChange={(e) => setEmail(e.target.value)}
-              placeholder="Enter your email"
-              required
-            />
-          </div>
-          <div>
-            <label htmlFor="password">Password</label>
-            <input
-              type="password"
-              id="password"
-              value={password}
-              onChange={(e) => setPassword(e.target.value)}
-              placeholder="Enter your password"
-              required
-            />
-          </div>
-          <button type="submit">Submit</button>
-
-          {/* Display message with appropriate styling */}
-          {message && (
-            <p className={messageType === "success" ? styles.successMessage : styles.errorMessage}>
-              {message}
-            </p>
-          )}
-          <h2 align="center" className={styles.or}>
-            OR
-          </h2>
-        </form>
-        <p>
-          Have an account? <Link to="/Login"> Login </Link>
-        </p>
-      </div>
-    </div>
   );
 }
