Improve style

static/css/style.css

@@ -1,84 +1,273 @@
+/* Default variables for light mode */
+:root {
+    --background-color: #f4f4f4;
+    --text-color: #333333;
+    --card-background: #ffffff;
+    --input-background: #f0f2f5;
+    --input-border: #e0e3e9;
+    --input-text: #333333;
+    --button-primary-bg: #5cb85c;
+    --button-primary-text: white;
+    --button-secondary-bg: #e0e3e9;
+    --button-secondary-text: #4a5568;
+    --border-color: #ddd;
+    --separator-color: #e0e3e9;
+    --error-color: #d9534f;
+    --success-color: #5cb85c;
+    --link-color: #3182ce;
+    --header-color: #333;
+    --hero-bg: #e7f3fe;
+    --hero-color: #333;
+    --welcome-bg: #e7f3fe;
+    --logout-button-bg: #d9534f;
+    --logout-button-hover: #c9302c;
+}
+
+/* Dark mode variables */
+@media (prefers-color-scheme: dark) {
+    :root {
+        --background-color: #1a202c;
+        --text-color: #e2e8f0;
+        --card-background: #2d3748;
+        --input-background: #4a5568;
+        --input-border: #4a5568;
+        --input-text: #e2e8f0;
+        --button-primary-bg: #6cb46c;
+        --button-primary-text: white;
+        --button-secondary-bg: #4a5568;
+        --button-secondary-text: #e2e8f0;
+        --border-color: #4a5568;
+        --separator-color: #4a5568;
+        --error-color: #fc8181;
+        --success-color: #68d391;
+        --link-color: #63b3ed;
+        --header-color: #e2e8f0;
+        --hero-bg: #2d3748;
+        --hero-color: #e2e8f0;
+        --welcome-bg: #2d3748;
+        --logout-button-bg: #e53e3e;
+        --logout-button-hover: #c53030;
+    }
+}
+
+/* Base styles */
+* {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+}
+
 body {
-    font-family: sans-serif;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+    background-color: var(--background-color);
+    color: var(--text-color);
     line-height: 1.6;
-    margin: 20px;
-    background-color: #f4f4f4;
+    transition: background-color 0.3s ease, color 0.3s ease;
+    margin: 0;
+    padding: 0;
 }
 
 h1, h2 {
-    color: #333;
+    color: var(--header-color);
 }
 
-.auth-section {
-    background-color: #fff;
+.container {
+    width: 100%;
+    max-width: 1000px;
+    margin: 20px auto;
     padding: 20px;
-    margin-bottom: 20px;
-    border: 1px solid #ddd;
-    border-radius: 5px;
-    max-width: 400px;
 }
 
-#welcome-section {
-     background-color: #e7f3fe;
-     padding: 20px;
-     border: 1px solid #c8e1f8;
-     border-radius: 5px;
+.logo {
+    text-align: center;
+    margin-bottom: 30px;
+}
+
+.logo h1 {
+    font-size: 2rem;
+    margin-bottom: 10px;
+}
+
+.logo p {
+    font-size: 1.1rem;
+    opacity: 0.8;
+}
+
+/* Auth container styles */
+.auth-container {
+    display: flex;
+    flex-direction: column;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    border-radius: 8px;
+    overflow: hidden;
+    background-color: var(--card-background);
+    transition: box-shadow 0.3s ease, background-color 0.3s ease;
+    margin-bottom: 30px;
+}
+
+@media (min-width: 768px) {
+    .auth-container {
+        flex-direction: row;
+        height: 500px;
+    }
+}
+
+.tabs {
+    display: flex;
+    border-bottom: 1px solid var(--separator-color);
+}
+
+.tab {
+    padding: 15px 0;
+    flex: 1;
+    text-align: center;
+    cursor: pointer;
+    font-weight: 600;
+    transition: background-color 0.3s ease;
+}
+
+.tab.active {
+    border-bottom: 3px solid var(--button-primary-bg);
+    color: var(--button-primary-bg);
+}
+
+.auth-forms {
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    padding: 30px;
+}
+
+.auth-form {
+    display: none;
+}
+
+.auth-form.active {
+    display: block;
+}
+
+.hero {
+    display: none;
+    flex: 1;
+    background-color: var(--hero-bg);
+    color: var(--hero-color);
+    padding: 40px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+@media (min-width: 768px) {
+    .hero {
+        display: flex;
+    }
+}
+
+.hero h2 {
+    margin-bottom: 20px;
+    color: var(--hero-color);
 }
 
+/* Form styles */
+.form-group {
+    margin-bottom: 20px;
+}
 
 label {
-    display: inline-block;
-    margin-bottom: 5px;
+    display: block;
+    margin-bottom: 7px;
+    font-weight: 500;
 }
 
 input[type="email"],
 input[type="password"] {
-    width: calc(100% - 22px); /* Account for padding/border */
-    padding: 10px;
-    margin-bottom: 10px;
-    border: 1px solid #ccc;
-    border-radius: 4px;
+    width: 100%;
+    padding: 12px 15px;
+    border-radius: 6px;
+    border: 1px solid var(--input-border);
+    background-color: var(--input-background);
+    color: var(--input-text);
+    font-size: 16px;
+    transition: border-color 0.3s ease, box-shadow 0.3s ease;
+}
+
+input:focus {
+    outline: none;
+    border-color: var(--button-primary-bg);
+    box-shadow: 0 0 0 3px rgba(92, 184, 92, 0.25);
 }
 
-button {
-    background-color: #5cb85c;
-    color: white;
-    padding: 10px 15px;
+.button {
+    display: inline-block;
+    padding: 12px 20px;
+    background-color: var(--button-primary-bg);
+    color: var(--button-primary-text);
     border: none;
-    border-radius: 4px;
+    border-radius: 6px;
+    font-size: 16px;
+    font-weight: 600;
     cursor: pointer;
-    font-size: 1em;
+    transition: opacity 0.3s ease, transform 0.1s ease;
+    width: 100%;
+    text-align: center;
 }
 
-button:hover {
-    background-color: #4cae4c;
+.button:hover {
+    opacity: 0.9;
 }
 
-#logout-button {
-     background-color: #d9534f;
-}
-#logout-button:hover {
-     background-color: #c9302c;
+.button:active {
+    transform: translateY(1px);
 }
 
+/* Status messages */
 .status-message {
     margin-top: 15px;
-    color: red;
+    color: var(--error-color);
     font-weight: bold;
+    display: none;
 }
+
 .status-message.success {
-    color: green;
+    color: var(--success-color);
+}
+
+.error-message {
+    color: var(--error-color);
+    font-size: 14px;
+    margin-top: 5px;
+    display: none;
+}
+
+/* Welcome section */
+#welcome-section {
+    background-color: var(--welcome-bg);
+    padding: 20px;
+    border: 1px solid var(--border-color);
+    border-radius: 5px;
+}
+
+#logout-button {
+    background-color: var(--logout-button-bg);
+    margin-top: 15px;
+    width: auto;
+}
+
+#logout-button:hover {
+    background-color: var(--logout-button-hover);
 }
 
 hr {
     margin: 20px 0;
+    border-color: var(--separator-color);
 }
 
+/* Notifications */
 #notifications {
     margin-top: 15px;
     padding: 15px;
-    border: 1px dashed #aaa;
-    background-color: #f9f9f9;
+    border: 1px dashed var(--border-color);
+    background-color: var(--card-background);
     min-height: 100px;
     max-height: 300px;
     overflow-y: auto;
@@ -87,8 +276,9 @@ hr {
 #notifications p {
     margin: 5px 0;
     padding-bottom: 5px;
-    border-bottom: 1px solid #eee;
+    border-bottom: 1px solid var(--separator-color);
 }
+
 #notifications p:last-child {
     border-bottom: none;
 }

static/js/script.js

@@ -1,5 +1,7 @@
-const registerSection = document.getElementById('register-section');
+const loginTab = document.getElementById('login-tab');
+const registerTab = document.getElementById('register-tab');
 const loginSection = document.getElementById('login-section');
+const registerSection = document.getElementById('register-section');
 const welcomeSection = document.getElementById('welcome-section');
 const registerForm = document.getElementById('register-form');
 const loginForm = document.getElementById('login-form');
@@ -14,10 +16,10 @@ const API_URL = '/api'; // Use relative path
 let webSocket = null;
 let authToken = localStorage.getItem('authToken'); // Load token on script start
 
-// --- UI Control ---
+// --- UI Control & Tab Switching ---
 function showSection(sectionId) {
-    registerSection.style.display = 'none';
     loginSection.style.display = 'none';
+    registerSection.style.display = 'none';
     welcomeSection.style.display = 'none';
 
     const sectionToShow = document.getElementById(sectionId);
@@ -28,6 +30,25 @@ function showSection(sectionId) {
     }
 }
 
+// Tab switching logic
+loginTab.addEventListener('click', () => {
+    loginTab.classList.add('active');
+    registerTab.classList.remove('active');
+    loginSection.classList.add('active');
+    registerSection.classList.remove('active');
+});
+
+registerTab.addEventListener('click', () => {
+    registerTab.classList.add('active');
+    loginTab.classList.remove('active');
+    registerSection.classList.add('active');
+    loginSection.classList.remove('active');
+});
+
+// Initialize first tab as active
+loginTab.classList.add('active');
+loginSection.classList.add('active');
+
 function setStatus(element, message, isSuccess = false) {
     element.textContent = message;
     element.className = isSuccess ? 'status-message success' : 'status-message';
@@ -67,7 +88,6 @@ async function apiRequest(endpoint, method = 'GET', body = null, token = null) {
     }
 }
 
-
 // --- WebSocket Handling ---
 function connectWebSocket(token) {
     if (!token) {
@@ -84,7 +104,6 @@ function connectWebSocket(token) {
     const wsUrl = `${wsProtocol}//${window.location.host}${API_URL}/ws/${token}`;
     console.log("Attempting to connect WebSocket:", wsUrl);
 
-
     webSocket = new WebSocket(wsUrl);
 
     webSocket.onopen = (event) => {
@@ -104,11 +123,10 @@ function connectWebSocket(token) {
                 p.textContent = messageData.message;
                 // Add message to the top
                 notificationsDiv.insertBefore(p, notificationsDiv.firstChild);
-                 // Limit number of messages shown (optional)
+                // Limit number of messages shown (optional)
                 while (notificationsDiv.children.length > 10) {
                     notificationsDiv.removeChild(notificationsDiv.lastChild);
                 }
-
             }
         } catch (error) {
             console.error("Error parsing WebSocket message:", error);
@@ -127,7 +145,6 @@ function connectWebSocket(token) {
         console.log("WebSocket connection closed:", event);
         webSocket = null; // Reset WebSocket variable
         // Optionally try to reconnect or inform user
-        // Do not clear notifications on close, user might want to see history
         if (!event.wasClean) {
             const p = document.createElement('p');
             p.textContent = `WebSocket disconnected unexpectedly (Code: ${event.code}). Please refresh or log out/in.`;
@@ -164,20 +181,22 @@ async function handleLogin(email, password) {
 }
 
 async function handleRegister(email, password) {
-     setStatus(registerStatus, "Registering...");
-     try {
+    setStatus(registerStatus, "Registering...");
+    try {
         const data = await apiRequest('/register', 'POST', { email, password });
         setStatus(registerStatus, `Registration successful for ${data.email}! Please log in.`, true);
         registerForm.reset(); // Clear form
-        showSection('login-section'); // Switch to login
-     } catch (error) {
+        // Switch to login tab
+        loginTab.click();
+    } catch (error) {
         setStatus(registerStatus, `Registration failed: ${error.message}`);
-     }
+    }
 }
 
 async function showWelcomePage() {
     if (!authToken) {
         showSection('login-section');
+        loginTab.click();
         return;
     }
     try {
@@ -199,8 +218,14 @@ function handleLogout() {
     disconnectWebSocket();
     setStatus(loginStatus, ""); // Clear any previous login errors
     showSection('login-section');
+    loginTab.click();
 }
 
+// --- Form Validation ---
+function validateEmail(email) {
+    const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+    return re.test(String(email).toLowerCase());
+}
 
 // --- Event Listeners ---
 registerForm.addEventListener('submit', (e) => {
@@ -208,27 +233,75 @@ registerForm.addEventListener('submit', (e) => {
     const email = document.getElementById('reg-email').value;
     const password = document.getElementById('reg-password').value;
     const confirmPassword = document.getElementById('reg-confirm-password').value;
-    if (password !== confirmPassword) {
-        setStatus(registerStatus, "Passwords do not match.");
-        return;
+    
+    const emailError = document.getElementById('register-email-error');
+    const passwordError = document.getElementById('register-password-error');
+    const confirmError = document.getElementById('register-confirm-error');
+    
+    let isValid = true;
+    
+    // Email validation
+    if (!validateEmail(email)) {
+        emailError.style.display = 'block';
+        isValid = false;
+    } else {
+        emailError.style.display = 'none';
     }
+    
+    // Password validation
     if (password.length < 8) {
-         setStatus(registerStatus, "Password must be at least 8 characters.");
-         return;
+        passwordError.style.display = 'block';
+        isValid = false;
+    } else {
+        passwordError.style.display = 'none';
+    }
+    
+    // Confirm password
+    if (password !== confirmPassword) {
+        confirmError.style.display = 'block';
+        isValid = false;
+    } else {
+        confirmError.style.display = 'none';
+    }
+    
+    if (isValid) {
+        handleRegister(email, password);
     }
-    handleRegister(email, password);
 });
 
 loginForm.addEventListener('submit', (e) => {
     e.preventDefault();
     const email = document.getElementById('login-email').value;
     const password = document.getElementById('login-password').value;
-    handleLogin(email, password);
+    
+    const emailError = document.getElementById('login-email-error');
+    const passwordError = document.getElementById('login-password-error');
+    
+    let isValid = true;
+    
+    // Email validation
+    if (!validateEmail(email)) {
+        emailError.style.display = 'block';
+        isValid = false;
+    } else {
+        emailError.style.display = 'none';
+    }
+    
+    // Simple password validation
+    if (password.length < 1) {
+        passwordError.style.display = 'block';
+        isValid = false;
+    } else {
+        passwordError.style.display = 'none';
+    }
+    
+    if (isValid) {
+        handleLogin(email, password);
+    }
 });
 
 logoutButton.addEventListener('click', handleLogout);
 
-
 // --- Initial Page Load Logic ---
 document.addEventListener('DOMContentLoaded', () => {
     if (authToken) {
@@ -236,6 +309,6 @@ document.addEventListener('DOMContentLoaded', () => {
         showWelcomePage(); // Try to fetch user info and show welcome
     } else {
         console.log("No token found, showing login page.");
-        showSection('login-section'); // Show login if no token
+        loginTab.click(); // Activate login tab
     }
 });

templates/index.html

@@ -7,47 +7,84 @@
     <link rel="stylesheet" href="/static/css/style.css">
 </head>
 <body>
-    <h1>Auth & Notification App</h1>
+    <div class="container">
+        <div class="logo">
+            <h1>Auth & Notification App</h1>
+            <p>Welcome! Please login to your account or create a new one.</p>
+        </div>
 
-    <!-- Registration Section -->
-    <div id="register-section" class="auth-section">
-        <h2>Register</h2>
-        <form id="register-form">
-            <label for="reg-email">Email:</label>
-            <input type="email" id="reg-email" name="email" required><br><br>
-            <label for="reg-password">Password:</label>
-            <input type="password" id="reg-password" name="password" required minlength="8"><br><br>
-            <label for="reg-confirm-password">Confirm Password:</label>
-            <input type="password" id="reg-confirm-password" name="confirm_password" required minlength="8"><br><br>
-            <button type="submit">Register</button>
-        </form>
-        <p id="register-status" class="status-message"></p>
-        <p>Already have an account? <a href="#" onclick="showSection('login-section')">Login here</a></p>
-    </div>
+        <div class="auth-container">
+            <div class="hero">
+                <h2>Welcome</h2>
+                <p>Please sign in or create a new account to continue.</p>
+            </div>
 
-    <!-- Login Section -->
-    <div id="login-section" class="auth-section" style="display: none;">
-        <h2>Login</h2>
-        <form id="login-form">
-            <label for="login-email">Email:</label>
-            <input type="email" id="login-email" name="email" required><br><br>
-            <label for="login-password">Password:</label>
-            <input type="password" id="login-password" name="password" required><br><br>
-            <button type="submit">Login</button>
-        </form>
-        <p id="login-status" class="status-message"></p>
-        <p>Don't have an account? <a href="#" onclick="showSection('register-section')">Register here</a></p>
-    </div>
+            <div class="auth-forms">
+                <div class="tabs">
+                    <div class="tab" id="login-tab">Login</div>
+                    <div class="tab" id="register-tab">Register</div>
+                </div>
+
+                <!-- Login Form -->
+                <div class="auth-form" id="login-section">
+                    <h2>Login to your account</h2>
+                    <form id="login-form">
+                        <div class="form-group">
+                            <label for="login-email">Email Address</label>
+                            <input type="email" id="login-email" name="email" placeholder="[email protected]" required>
+                            <div class="error-message" id="login-email-error">Please enter a valid email address</div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label for="login-password">Password</label>
+                            <input type="password" id="login-password" name="password" placeholder="Enter your password" required>
+                            <div class="error-message" id="login-password-error">Password must be at least 8 characters</div>
+                        </div>
+                        
+                        <button type="submit" class="button">Login Now</button>
+                        <p id="login-status" class="status-message"></p>
+                    </form>
+                </div>
+
+                <!-- Registration Form -->
+                <div class="auth-form" id="register-section">
+                    <h2>Create your account</h2>
+                    <form id="register-form">
+                        <div class="form-group">
+                            <label for="reg-email">Email Address</label>
+                            <input type="email" id="reg-email" name="email" placeholder="[email protected]" required>
+                            <div class="error-message" id="register-email-error">Please enter a valid email address</div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label for="reg-password">Password</label>
+                            <input type="password" id="reg-password" name="password" placeholder="Create a password" required minlength="8">
+                            <div class="error-message" id="register-password-error">Password must be at least 8 characters</div>
+                        </div>
+                        
+                        <div class="form-group">
+                            <label for="reg-confirm-password">Confirm Password</label>
+                            <input type="password" id="reg-confirm-password" name="confirm_password" placeholder="Confirm your password" required minlength="8">
+                            <div class="error-message" id="register-confirm-error">Passwords do not match</div>
+                        </div>
+                        
+                        <button type="submit" class="button">Create Account</button>
+                        <p id="register-status" class="status-message"></p>
+                    </form>
+                </div>
+            </div>
+        </div>
 
-    <!-- Welcome Section (shown after login) -->
-    <div id="welcome-section" style="display: none;">
-        <h2>Welcome!</h2>
-        <p id="welcome-message">Welcome, user!</p>
-        <button id="logout-button">Logout</button>
-        <hr>
-        <h2>Real-time Notifications</h2>
-        <div id="notifications">
-            <p><em>Notifications will appear here...</em></p>
+        <!-- Welcome Section (shown after login) -->
+        <div id="welcome-section" style="display: none;">
+            <h2>Welcome!</h2>
+            <p id="welcome-message">Welcome, user!</p>
+            <button id="logout-button" class="button">Logout</button>
+            <hr>
+            <h2>Real-time Notifications</h2>
+            <div id="notifications">
+                <p><em>Notifications will appear here...</em></p>
+            </div>
         </div>
     </div>