Add signup functionality to Login component with email support and proxy middleware for API requests

This commit is contained in:
AdamT20054
2025-09-21 03:32:41 +01:00
parent 976ca79f57
commit e1b8e4458a
3 changed files with 98 additions and 9 deletions

View File

@@ -20,6 +20,7 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"date-fns": "^2.30.0", "date-fns": "^2.30.0",
"express": "^4.18.2", "express": "^4.18.2",
"http-proxy-middleware": "^2.0.6",
"lucide-react": "^0.294.0", "lucide-react": "^0.294.0",
"react": "^18.2.0", "react": "^18.2.0",
"react-chartjs-2": "^5.2.0", "react-chartjs-2": "^5.2.0",
@@ -41,6 +42,6 @@
"vite": "^7.1.5" "vite": "^7.1.5"
}, },
"overrides": { "overrides": {
"esbuild": "^0.24.4" "esbuild": "^0.25.10"
} }
} }

View File

@@ -2,12 +2,14 @@ import express from 'express';
import path from 'path'; import path from 'path';
import cors from 'cors'; import cors from 'cors';
import { fileURLToPath } from 'url'; import { fileURLToPath } from 'url';
import { createProxyMiddleware } from 'http-proxy-middleware';
const __filename = fileURLToPath(import.meta.url); const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename); const __dirname = path.dirname(__filename);
const app = express(); const app = express();
const PORT = process.env.PORT || 3000; const PORT = process.env.PORT || 3000;
const BACKEND_URL = process.env.BACKEND_URL || 'http://backend:3001';
// Enable CORS for API calls // Enable CORS for API calls
app.use(cors({ app.use(cors({
@@ -15,6 +17,20 @@ app.use(cors({
credentials: true credentials: true
})); }));
// Proxy API requests to backend
app.use('/api', createProxyMiddleware({
target: BACKEND_URL,
changeOrigin: true,
logLevel: 'info',
onError: (err, req, res) => {
console.error('Proxy error:', err.message);
res.status(500).json({ error: 'Backend service unavailable' });
},
onProxyReq: (proxyReq, req, res) => {
console.log(`Proxying ${req.method} ${req.path} to ${BACKEND_URL}`);
}
}));
// Serve static files from dist directory // Serve static files from dist directory
app.use(express.static(path.join(__dirname, 'dist'))); app.use(express.static(path.join(__dirname, 'dist')));

View File

@@ -1,12 +1,14 @@
import React, { useState } from 'react' import React, { useState } from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { Eye, EyeOff, Lock, User, AlertCircle, Smartphone, ArrowLeft } from 'lucide-react' import { Eye, EyeOff, Lock, User, AlertCircle, Smartphone, ArrowLeft, Mail } from 'lucide-react'
import { useAuth } from '../contexts/AuthContext' import { useAuth } from '../contexts/AuthContext'
import { authAPI } from '../utils/api' import { authAPI } from '../utils/api'
const Login = () => { const Login = () => {
const [isSignupMode, setIsSignupMode] = useState(false)
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
username: '', username: '',
email: '',
password: '' password: ''
}) })
const [tfaData, setTfaData] = useState({ const [tfaData, setTfaData] = useState({
@@ -49,6 +51,36 @@ const Login = () => {
} }
} }
const handleSignupSubmit = async (e) => {
e.preventDefault()
setIsLoading(true)
setError('')
try {
const response = await authAPI.signup(formData.username, formData.email, formData.password)
if (response.data && response.data.token) {
// Store token and user data
localStorage.setItem('token', response.data.token)
localStorage.setItem('user', JSON.stringify(response.data.user))
// Redirect to dashboard
navigate('/')
} else {
setError('Signup failed - invalid response')
}
} catch (err) {
console.error('Signup error:', err)
const errorMessage = err.response?.data?.error ||
(err.response?.data?.errors && err.response.data.errors.length > 0
? err.response.data.errors.map(e => e.msg).join(', ')
: err.message || 'Signup failed')
setError(errorMessage)
} finally {
setIsLoading(false)
}
}
const handleTfaSubmit = async (e) => { const handleTfaSubmit = async (e) => {
e.preventDefault() e.preventDefault()
setIsLoading(true) setIsLoading(true)
@@ -102,6 +134,16 @@ const Login = () => {
setError('') setError('')
} }
const toggleMode = () => {
setIsSignupMode(!isSignupMode)
setFormData({
username: '',
email: '',
password: ''
})
setError('')
}
return ( return (
<div className="min-h-screen flex items-center justify-center bg-secondary-50 py-12 px-4 sm:px-6 lg:px-8"> <div className="min-h-screen flex items-center justify-center bg-secondary-50 py-12 px-4 sm:px-6 lg:px-8">
<div className="max-w-md w-full space-y-8"> <div className="max-w-md w-full space-y-8">
@@ -110,7 +152,7 @@ const Login = () => {
<Lock className="h-6 w-6 text-primary-600" /> <Lock className="h-6 w-6 text-primary-600" />
</div> </div>
<h2 className="mt-6 text-center text-3xl font-extrabold text-secondary-900"> <h2 className="mt-6 text-center text-3xl font-extrabold text-secondary-900">
Sign in to PatchMon {isSignupMode ? 'Create PatchMon Account' : 'Sign in to PatchMon'}
</h2> </h2>
<p className="mt-2 text-center text-sm text-secondary-600"> <p className="mt-2 text-center text-sm text-secondary-600">
Monitor and manage your Linux package updates Monitor and manage your Linux package updates
@@ -118,11 +160,11 @@ const Login = () => {
</div> </div>
{!requiresTfa ? ( {!requiresTfa ? (
<form className="mt-8 space-y-6" onSubmit={handleSubmit}> <form className="mt-8 space-y-6" onSubmit={isSignupMode ? handleSignupSubmit : handleSubmit}>
<div className="space-y-4"> <div className="space-y-4">
<div> <div>
<label htmlFor="username" className="block text-sm font-medium text-secondary-700"> <label htmlFor="username" className="block text-sm font-medium text-secondary-700">
Username or Email {isSignupMode ? 'Username' : 'Username or Email'}
</label> </label>
<div className="mt-1 relative"> <div className="mt-1 relative">
<div className="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none"> <div className="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
@@ -136,11 +178,34 @@ const Login = () => {
value={formData.username} value={formData.username}
onChange={handleInputChange} onChange={handleInputChange}
className="appearance-none rounded-md relative block w-full pl-10 pr-3 py-2 border border-secondary-300 placeholder-secondary-500 text-secondary-900 focus:outline-none focus:ring-primary-500 focus:border-primary-500 focus:z-10 sm:text-sm" className="appearance-none rounded-md relative block w-full pl-10 pr-3 py-2 border border-secondary-300 placeholder-secondary-500 text-secondary-900 focus:outline-none focus:ring-primary-500 focus:border-primary-500 focus:z-10 sm:text-sm"
placeholder="Enter your username or email" placeholder={isSignupMode ? "Enter your username" : "Enter your username or email"}
/> />
</div> </div>
</div> </div>
{isSignupMode && (
<div>
<label htmlFor="email" className="block text-sm font-medium text-secondary-700">
Email
</label>
<div className="mt-1 relative">
<div className="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none">
<Mail className="h-5 w-5 text-secondary-400" />
</div>
<input
id="email"
name="email"
type="email"
required
value={formData.email}
onChange={handleInputChange}
className="appearance-none rounded-md relative block w-full pl-10 pr-3 py-2 border border-secondary-300 placeholder-secondary-500 text-secondary-900 focus:outline-none focus:ring-primary-500 focus:border-primary-500 focus:z-10 sm:text-sm"
placeholder="Enter your email"
/>
</div>
</div>
)}
<div> <div>
<label htmlFor="password" className="block text-sm font-medium text-secondary-700"> <label htmlFor="password" className="block text-sm font-medium text-secondary-700">
Password Password
@@ -196,17 +261,24 @@ const Login = () => {
{isLoading ? ( {isLoading ? (
<div className="flex items-center"> <div className="flex items-center">
<div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div> <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white mr-2"></div>
Signing in... {isSignupMode ? 'Creating account...' : 'Signing in...'}
</div> </div>
) : ( ) : (
'Sign in' isSignupMode ? 'Create Account' : 'Sign in'
)} )}
</button> </button>
</div> </div>
<div className="text-center"> <div className="text-center">
<p className="text-sm text-secondary-600"> <p className="text-sm text-secondary-600">
Need help? Contact your system administrator. {isSignupMode ? 'Already have an account?' : "Don't have an account?"}{' '}
<button
type="button"
onClick={toggleMode}
className="font-medium text-primary-600 hover:text-primary-500 focus:outline-none focus:underline"
>
{isSignupMode ? 'Sign in' : 'Sign up'}
</button>
</p> </p>
</div> </div>
</form> </form>