Backend: - Auth router (login, register, logout) - Profiles router (get current profile) - Registered in main.py Frontend: - LoginPage with login/register tabs - Dashboard with welcome screen - Simplified AuthContext for Shinkan - Protected routes in App.jsx - Public routes redirect when logged in Ready for testing! version: 0.1.0
This commit is contained in:
1 parent
fd5efa8662
commit
efc2a11a76
8 files changed
+1045
-148
No files matched your search
+76
-41
@@ -1,50 +1,85 @@
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import React from 'react'
|
||||
import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-dom'
|
||||
import { AuthProvider } from './context/AuthContext'
|
||||
import { AuthProvider, useAuth } from './context/AuthContext'
|
||||
import LoginPage from './pages/LoginPage'
|
||||
import Dashboard from './pages/Dashboard'
|
||||
|
||||
// Protected Route Component
|
||||
function ProtectedRoute({ children }) {
|
||||
const { isAuthenticated, loading } = useAuth()
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div style={{
|
||||
minHeight: '100vh',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
background: 'var(--bg)'
|
||||
}}>
|
||||
<div className="spinner"></div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return isAuthenticated ? children : <Navigate to="/login" replace />
|
||||
}
|
||||
|
||||
// Public Route Component (redirect to dashboard if already logged in)
|
||||
function PublicRoute({ children }) {
|
||||
const { isAuthenticated, loading } = useAuth()
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div style={{
|
||||
minHeight: '100vh',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
background: 'var(--bg)'
|
||||
}}>
|
||||
<div className="spinner"></div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return !isAuthenticated ? children : <Navigate to="/" replace />
|
||||
}
|
||||
|
||||
function AppRoutes() {
|
||||
return (
|
||||
<Routes>
|
||||
{/* Public Routes */}
|
||||
<Route
|
||||
path="/login"
|
||||
element={
|
||||
<PublicRoute>
|
||||
<LoginPage />
|
||||
</PublicRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
{/* Protected Routes */}
|
||||
<Route
|
||||
path="/"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<Dashboard />
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
{/* Catch all - redirect to dashboard or login */}
|
||||
<Route path="*" element={<Navigate to="/" replace />} />
|
||||
</Routes>
|
||||
)
|
||||
}
|
||||
|
||||
function App() {
|
||||
const [version, setVersion] = useState(null)
|
||||
|
||||
useEffect(() => {
|
||||
// Load version from API
|
||||
fetch('/api/version')
|
||||
.then(res => res.json())
|
||||
.then(data => setVersion(data))
|
||||
.catch(err => console.error('Failed to load version:', err))
|
||||
}, [])
|
||||
|
||||
return (
|
||||
<AuthProvider>
|
||||
<Router>
|
||||
<div className="app">
|
||||
<div className="container">
|
||||
<h1>🥋 Shinkan Jinkendo</h1>
|
||||
<p>Trainer- und Vereinsplattform für Kampfsport-Trainingsplanung</p>
|
||||
|
||||
{version && (
|
||||
<div className="card" style={{ marginTop: '2rem' }}>
|
||||
<h3>System Status</h3>
|
||||
<p><strong>Version:</strong> {version.app_version}</p>
|
||||
<p><strong>Build:</strong> {version.build_date}</p>
|
||||
<p><strong>Environment:</strong> {version.environment}</p>
|
||||
<p><strong>DB Schema:</strong> {version.db_schema_version}</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="card" style={{ marginTop: '2rem' }}>
|
||||
<h3>🚧 In Entwicklung</h3>
|
||||
<p>Die App wird gerade aufgebaut.</p>
|
||||
<ul style={{ textAlign: 'left', marginTop: '1rem' }}>
|
||||
<li>✅ Backend-Basis</li>
|
||||
<li>✅ Docker-Setup</li>
|
||||
<li>✅ Datenbank-Schema</li>
|
||||
<li>🔲 Auth-System</li>
|
||||
<li>🔲 Übungsverwaltung</li>
|
||||
<li>🔲 Trainingsplanung</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<AppRoutes />
|
||||
</Router>
|
||||
</AuthProvider>
|
||||
)
|
||||
|
||||
@@ -2,132 +2,74 @@ import { createContext, useContext, useState, useEffect } from 'react'
|
||||
|
||||
const AuthContext = createContext(null)
|
||||
|
||||
const TOKEN_KEY = 'bodytrack_token'
|
||||
const PROFILE_KEY = 'bodytrack_active_profile'
|
||||
|
||||
export function AuthProvider({ children }) {
|
||||
const [session, setSession] = useState(null) // {token, profile_id, role}
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [needsSetup, setNeedsSetup] = useState(false)
|
||||
const [user, setUser] = useState(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
checkStatus()
|
||||
checkAuth()
|
||||
}, [])
|
||||
|
||||
const checkStatus = async () => {
|
||||
const checkAuth = async () => {
|
||||
const token = localStorage.getItem('authToken')
|
||||
if (!token) {
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const r = await fetch('/api/auth/status')
|
||||
const status = await r.json()
|
||||
|
||||
if (status.needs_setup) {
|
||||
setNeedsSetup(true)
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
|
||||
// Try existing token
|
||||
const token = localStorage.getItem(TOKEN_KEY)
|
||||
if (token) {
|
||||
const me = await fetch('/api/auth/me', {
|
||||
headers: { 'X-Auth-Token': token }
|
||||
})
|
||||
if (me.ok) {
|
||||
const profile = await me.json()
|
||||
setSession({ token, profile_id: profile.id, role: profile.role, profile })
|
||||
setLoading(false)
|
||||
return
|
||||
const response = await fetch('/api/profiles/me', {
|
||||
headers: {
|
||||
'X-Auth-Token': token
|
||||
}
|
||||
// Token expired
|
||||
localStorage.removeItem(TOKEN_KEY)
|
||||
})
|
||||
|
||||
if (response.ok) {
|
||||
const profile = await response.json()
|
||||
setUser(profile)
|
||||
} else {
|
||||
// Token invalid
|
||||
localStorage.removeItem('authToken')
|
||||
}
|
||||
} catch(e) {
|
||||
console.error('Auth check failed', e)
|
||||
} catch (err) {
|
||||
console.error('Auth check failed:', err)
|
||||
localStorage.removeItem('authToken')
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
setLoading(false)
|
||||
}
|
||||
|
||||
const login = async (credentials) => {
|
||||
// Support both new {email, pin} and legacy {profile_id, pin}
|
||||
const body = typeof credentials === 'object' ? credentials : { profile_id: credentials }
|
||||
const r = await fetch('/api/auth/login', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body)
|
||||
})
|
||||
if (!r.ok) {
|
||||
const err = await r.json()
|
||||
throw new Error(err.detail || 'Login fehlgeschlagen')
|
||||
}
|
||||
const data = await r.json()
|
||||
localStorage.setItem(TOKEN_KEY, data.token)
|
||||
localStorage.setItem(PROFILE_KEY, data.profile_id)
|
||||
// Fetch full profile
|
||||
const me = await fetch('/api/auth/me', { headers: { 'X-Auth-Token': data.token } })
|
||||
const profile = await me.json()
|
||||
setSession({ token: data.token, profile_id: data.profile_id, role: data.role, profile })
|
||||
return data
|
||||
const login = (data) => {
|
||||
setUser(data.profile || data)
|
||||
}
|
||||
|
||||
const setup = async (formData) => {
|
||||
const r = await fetch('/api/auth/setup', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(formData)
|
||||
})
|
||||
if (!r.ok) {
|
||||
const err = await r.json()
|
||||
throw new Error(err.detail || 'Setup fehlgeschlagen')
|
||||
}
|
||||
const data = await r.json()
|
||||
localStorage.setItem(TOKEN_KEY, data.token)
|
||||
localStorage.setItem(PROFILE_KEY, data.profile_id)
|
||||
setNeedsSetup(false)
|
||||
await checkStatus()
|
||||
return data
|
||||
const logout = () => {
|
||||
setUser(null)
|
||||
localStorage.removeItem('authToken')
|
||||
}
|
||||
|
||||
const setAuthFromToken = (token, profile) => {
|
||||
// Direct token/profile set (for email verification auto-login)
|
||||
localStorage.setItem(TOKEN_KEY, token)
|
||||
localStorage.setItem(PROFILE_KEY, profile.id)
|
||||
setSession({
|
||||
token,
|
||||
profile_id: profile.id,
|
||||
role: profile.role || 'user',
|
||||
profile
|
||||
})
|
||||
const value = {
|
||||
user,
|
||||
isAuthenticated: !!user,
|
||||
loading,
|
||||
login,
|
||||
logout,
|
||||
checkAuth
|
||||
}
|
||||
|
||||
const logout = async () => {
|
||||
const token = localStorage.getItem(TOKEN_KEY)
|
||||
if (token) {
|
||||
await fetch('/api/auth/logout', { method: 'POST', headers: { 'X-Auth-Token': token } })
|
||||
}
|
||||
localStorage.removeItem(TOKEN_KEY)
|
||||
setSession(null)
|
||||
}
|
||||
|
||||
const isAdmin = session?.role === 'admin'
|
||||
const canUseAI = session?.profile?.ai_enabled !== 0
|
||||
const canExport = session?.profile?.export_enabled !== 0
|
||||
|
||||
return (
|
||||
<AuthContext.Provider value={{
|
||||
session, loading, needsSetup,
|
||||
login, setup, logout, setAuthFromToken,
|
||||
isAdmin, canUseAI, canExport,
|
||||
token: session?.token,
|
||||
profileId: session?.profile_id,
|
||||
}}>
|
||||
<AuthContext.Provider value={value}>
|
||||
{children}
|
||||
</AuthContext.Provider>
|
||||
)
|
||||
}
|
||||
|
||||
export function useAuth() {
|
||||
return useContext(AuthContext)
|
||||
const context = useContext(AuthContext)
|
||||
if (!context) {
|
||||
throw new Error('useAuth must be used within AuthProvider')
|
||||
}
|
||||
return context
|
||||
}
|
||||
|
||||
export function getToken() {
|
||||
return localStorage.getItem(TOKEN_KEY)
|
||||
}
|
||||
export default AuthContext
|
||||
@@ -0,0 +1,159 @@
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '../context/AuthContext'
|
||||
import api from '../utils/api'
|
||||
|
||||
function Dashboard() {
|
||||
const [version, setVersion] = useState(null)
|
||||
const [profile, setProfile] = useState(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const { logout } = useAuth()
|
||||
const navigate = useNavigate()
|
||||
|
||||
useEffect(() => {
|
||||
loadData()
|
||||
}, [])
|
||||
|
||||
const loadData = async () => {
|
||||
try {
|
||||
const [versionData, profileData] = await Promise.all([
|
||||
api.getVersion(),
|
||||
api.getCurrentProfile()
|
||||
])
|
||||
setVersion(versionData)
|
||||
setProfile(profileData)
|
||||
} catch (err) {
|
||||
console.error('Failed to load data:', err)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleLogout = async () => {
|
||||
try {
|
||||
await api.logout()
|
||||
} catch (err) {
|
||||
console.error('Logout error:', err)
|
||||
} finally {
|
||||
localStorage.removeItem('authToken')
|
||||
logout()
|
||||
navigate('/login')
|
||||
}
|
||||
}
|
||||
|
||||
if (loading) {
|
||||
return (
|
||||
<div style={{ padding: '2rem', textAlign: 'center' }}>
|
||||
<div className="spinner"></div>
|
||||
<p>Laden...</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ minHeight: '100vh', background: 'var(--bg)', padding: '1rem' }}>
|
||||
{/* Header */}
|
||||
<div style={{
|
||||
maxWidth: '1200px',
|
||||
margin: '0 auto',
|
||||
display: 'flex',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
marginBottom: '2rem'
|
||||
}}>
|
||||
<div>
|
||||
<h1 style={{ margin: 0 }}>🥋 Shinkan Jinkendo</h1>
|
||||
<p style={{ color: 'var(--text2)', margin: '0.25rem 0 0 0' }}>
|
||||
Willkommen, {profile?.name || profile?.email}
|
||||
</p>
|
||||
</div>
|
||||
<button className="btn btn-secondary" onClick={handleLogout}>
|
||||
Abmelden
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Main Content */}
|
||||
<div style={{ maxWidth: '1200px', margin: '0 auto' }}>
|
||||
{/* Welcome Card */}
|
||||
<div className="card" style={{ marginBottom: '1.5rem' }}>
|
||||
<h2>Dashboard</h2>
|
||||
<p style={{ color: 'var(--text2)' }}>
|
||||
Trainer- und Vereinsplattform für Kampfsport-Trainingsplanung
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{/* Status Grid */}
|
||||
<div style={{
|
||||
display: 'grid',
|
||||
gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))',
|
||||
gap: '1rem',
|
||||
marginBottom: '1.5rem'
|
||||
}}>
|
||||
<div className="card">
|
||||
<h3>✅ Fertig</h3>
|
||||
<ul style={{ marginTop: '1rem', paddingLeft: '1.5rem' }}>
|
||||
<li>Backend-Basis</li>
|
||||
<li>Datenbank-Schema</li>
|
||||
<li>Auth-System</li>
|
||||
<li>Login & Registrierung</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="card">
|
||||
<h3>🚧 In Arbeit</h3>
|
||||
<ul style={{ marginTop: '1rem', paddingLeft: '1.5rem' }}>
|
||||
<li>Übungsverwaltung</li>
|
||||
<li>Trainingsplanung</li>
|
||||
<li>Kataloge (Skills, Methods)</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div className="card">
|
||||
<h3>📋 Geplant</h3>
|
||||
<ul style={{ marginTop: '1rem', paddingLeft: '1.5rem' }}>
|
||||
<li>MediaWiki-Import</li>
|
||||
<li>Trainingsprogramme</li>
|
||||
<li>Admin-Panel</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* System Info */}
|
||||
{version && (
|
||||
<div className="card">
|
||||
<h3>System-Information</h3>
|
||||
<div style={{ display: 'grid', gridTemplateColumns: '150px 1fr', gap: '0.5rem', marginTop: '1rem' }}>
|
||||
<strong>Version:</strong>
|
||||
<span>{version.app_version}</span>
|
||||
|
||||
<strong>Build:</strong>
|
||||
<span>{version.build_date}</span>
|
||||
|
||||
<strong>Umgebung:</strong>
|
||||
<span>{version.environment}</span>
|
||||
|
||||
<strong>DB Schema:</strong>
|
||||
<span>{version.db_schema_version}</span>
|
||||
|
||||
<strong>Dein Tier:</strong>
|
||||
<span style={{
|
||||
padding: '0.25rem 0.5rem',
|
||||
background: profile?.tier === 'premium' ? 'var(--accent)' : 'var(--surface2)',
|
||||
color: profile?.tier === 'premium' ? 'white' : 'var(--text1)',
|
||||
borderRadius: '4px',
|
||||
display: 'inline-block'
|
||||
}}>
|
||||
{profile?.tier || 'free'}
|
||||
</span>
|
||||
|
||||
<strong>Rolle:</strong>
|
||||
<span>{profile?.role || 'user'}</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default Dashboard
|
||||
@@ -0,0 +1,158 @@
|
||||
import React, { useState } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useAuth } from '../context/AuthContext'
|
||||
import api from '../utils/api'
|
||||
|
||||
function LoginPage() {
|
||||
const [mode, setMode] = useState('login') // 'login' or 'register'
|
||||
const [email, setEmail] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [name, setName] = useState('')
|
||||
const [error, setError] = useState('')
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [success, setSuccess] = useState('')
|
||||
|
||||
const navigate = useNavigate()
|
||||
const { login: authLogin } = useAuth()
|
||||
|
||||
const handleSubmit = async (e) => {
|
||||
e.preventDefault()
|
||||
setError('')
|
||||
setSuccess('')
|
||||
setLoading(true)
|
||||
|
||||
try {
|
||||
if (mode === 'login') {
|
||||
const response = await api.login(email, password)
|
||||
localStorage.setItem('authToken', response.token)
|
||||
authLogin({ token: response.token, profile: response.profile })
|
||||
navigate('/')
|
||||
} else {
|
||||
await api.register(email, password, name)
|
||||
setSuccess('Registrierung erfolgreich! Bitte prüfe deine E-Mails.')
|
||||
setMode('login')
|
||||
setPassword('')
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err.message || 'Ein Fehler ist aufgetreten')
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="login-container" style={{
|
||||
minHeight: '100vh',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
background: 'var(--bg)',
|
||||
padding: '1rem'
|
||||
}}>
|
||||
<div className="card" style={{ maxWidth: '400px', width: '100%' }}>
|
||||
<h1 style={{ textAlign: 'center', marginBottom: '0.5rem' }}>
|
||||
🥋 Shinkan Jinkendo
|
||||
</h1>
|
||||
<p style={{ textAlign: 'center', color: 'var(--text2)', marginBottom: '2rem' }}>
|
||||
Trainer- und Vereinsplattform
|
||||
</p>
|
||||
|
||||
<div style={{ display: 'flex', gap: '0.5rem', marginBottom: '1.5rem' }}>
|
||||
<button
|
||||
className={mode === 'login' ? 'btn btn-primary' : 'btn btn-secondary'}
|
||||
onClick={() => setMode('login')}
|
||||
style={{ flex: 1 }}
|
||||
>
|
||||
Login
|
||||
</button>
|
||||
<button
|
||||
className={mode === 'register' ? 'btn btn-primary' : 'btn btn-secondary'}
|
||||
onClick={() => setMode('register')}
|
||||
style={{ flex: 1 }}
|
||||
>
|
||||
Registrieren
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleSubmit}>
|
||||
{mode === 'register' && (
|
||||
<div className="form-row">
|
||||
<label className="form-label">Name</label>
|
||||
<input
|
||||
type="text"
|
||||
className="form-input"
|
||||
value={name}
|
||||
onChange={(e) => setName(e.target.value)}
|
||||
required={mode === 'register'}
|
||||
placeholder="Dein Name"
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="form-row">
|
||||
<label className="form-label">E-Mail</label>
|
||||
<input
|
||||
type="email"
|
||||
className="form-input"
|
||||
value={email}
|
||||
onChange={(e) => setEmail(e.target.value)}
|
||||
required
|
||||
placeholder="name@beispiel.de"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="form-row">
|
||||
<label className="form-label">Passwort</label>
|
||||
<input
|
||||
type="password"
|
||||
className="form-input"
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
required
|
||||
placeholder="••••••••"
|
||||
minLength="6"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div style={{
|
||||
padding: '0.75rem',
|
||||
background: 'var(--danger)',
|
||||
color: 'white',
|
||||
borderRadius: '8px',
|
||||
marginBottom: '1rem'
|
||||
}}>
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{success && (
|
||||
<div style={{
|
||||
padding: '0.75rem',
|
||||
background: 'var(--accent)',
|
||||
color: 'white',
|
||||
borderRadius: '8px',
|
||||
marginBottom: '1rem'
|
||||
}}>
|
||||
{success}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
className="btn btn-primary btn-full"
|
||||
disabled={loading}
|
||||
>
|
||||
{loading ? 'Laden...' : mode === 'login' ? 'Anmelden' : 'Registrieren'}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<p style={{ textAlign: 'center', color: 'var(--text3)', marginTop: '1.5rem', fontSize: '0.875rem' }}>
|
||||
v0.1.0 • Development
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default LoginPage
|
||||
Reference in new issue
Block a user