feat: Implement initial with admin and mobile clients, authentication, data models, and lead generation scripts.
This commit is contained in:
60
innungsapp/apps/admin/app/api/setup/route.ts
Normal file
60
innungsapp/apps/admin/app/api/setup/route.ts
Normal file
@@ -0,0 +1,60 @@
|
||||
/**
|
||||
* DEV-ONLY: Sets a password for the demo admin user via better-auth.
|
||||
* Call once after seeding: GET http://localhost:3032/api/setup
|
||||
* Remove this file before going to production.
|
||||
*/
|
||||
import { NextResponse } from 'next/server'
|
||||
import { auth } from '@/lib/auth'
|
||||
import { prisma } from '@innungsapp/shared'
|
||||
|
||||
export async function GET() {
|
||||
if (process.env.NODE_ENV === 'production') {
|
||||
return NextResponse.json({ error: 'Not available in production' }, { status: 403 })
|
||||
}
|
||||
|
||||
// Delete the pre-seeded user so better-auth can create it fresh with a hashed password
|
||||
await prisma.account.deleteMany({ where: { userId: 'demo-admin-user-id' } })
|
||||
await prisma.member.deleteMany({ where: { userId: 'demo-admin-user-id' } })
|
||||
await prisma.userRole.deleteMany({ where: { userId: 'demo-admin-user-id' } })
|
||||
await prisma.user.deleteMany({ where: { id: 'demo-admin-user-id' } })
|
||||
|
||||
// Re-create via better-auth so the password is properly hashed
|
||||
const result = await auth.api.signUpEmail({
|
||||
body: { email: 'admin@demo.de', password: 'demo1234', name: 'Demo Admin' },
|
||||
})
|
||||
|
||||
if (!result?.user) {
|
||||
return NextResponse.json({ error: 'signUp failed', result }, { status: 500 })
|
||||
}
|
||||
|
||||
const newUserId = result.user.id
|
||||
|
||||
// Restore org membership for the new user ID
|
||||
const org = await prisma.organization.findFirst({ where: { slug: 'innung-elektro-stuttgart' } })
|
||||
if (org) {
|
||||
await prisma.userRole.upsert({
|
||||
where: { orgId_userId: { orgId: org.id, userId: newUserId } },
|
||||
update: {},
|
||||
create: { orgId: org.id, userId: newUserId, role: 'admin' },
|
||||
})
|
||||
await prisma.member.upsert({
|
||||
where: { userId: newUserId },
|
||||
update: {},
|
||||
create: {
|
||||
orgId: org.id,
|
||||
userId: newUserId,
|
||||
name: 'Demo Admin',
|
||||
betrieb: 'Innungsgeschäftsstelle',
|
||||
sparte: 'Elektrotechnik',
|
||||
ort: 'Stuttgart',
|
||||
email: 'admin@demo.de',
|
||||
status: 'aktiv',
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
return NextResponse.json({
|
||||
ok: true,
|
||||
message: 'Setup complete. Login: admin@demo.de / demo1234',
|
||||
})
|
||||
}
|
||||
@@ -3,14 +3,16 @@
|
||||
import { useState } from 'react'
|
||||
import { createAuthClient } from 'better-auth/react'
|
||||
import { magicLinkClient } from 'better-auth/client/plugins'
|
||||
|
||||
const authClient = createAuthClient({
|
||||
baseURL: process.env.NEXT_PUBLIC_APP_URL ?? 'http://localhost:3000',
|
||||
plugins: [magicLinkClient()],
|
||||
})
|
||||
|
||||
type Mode = 'password' | 'magic'
|
||||
|
||||
export default function LoginPage() {
|
||||
const [mode, setMode] = useState<Mode>('password')
|
||||
const [email, setEmail] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [sent, setSent] = useState(false)
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
@@ -20,16 +22,29 @@ export default function LoginPage() {
|
||||
setLoading(true)
|
||||
setError('')
|
||||
|
||||
const result = await authClient.signIn.magicLink({
|
||||
email,
|
||||
callbackURL: '/dashboard',
|
||||
})
|
||||
|
||||
setLoading(false)
|
||||
if (result.error) {
|
||||
setError(result.error.message ?? 'Ein Fehler ist aufgetreten.')
|
||||
if (mode === 'password') {
|
||||
const result = await authClient.signIn.email({
|
||||
email,
|
||||
password,
|
||||
callbackURL: '/dashboard',
|
||||
})
|
||||
setLoading(false)
|
||||
if (result.error) {
|
||||
setError(result.error.message ?? 'E-Mail oder Passwort falsch.')
|
||||
} else {
|
||||
window.location.href = '/dashboard'
|
||||
}
|
||||
} else {
|
||||
setSent(true)
|
||||
const result = await authClient.signIn.magicLink({
|
||||
email,
|
||||
callbackURL: '/dashboard',
|
||||
})
|
||||
setLoading(false)
|
||||
if (result.error) {
|
||||
setError(result.error.message ?? 'Ein Fehler ist aufgetreten.')
|
||||
} else {
|
||||
setSent(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -53,9 +68,7 @@ export default function LoginPage() {
|
||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" />
|
||||
</svg>
|
||||
</div>
|
||||
<h2 className="text-xl font-semibold text-gray-900 mb-2">
|
||||
E-Mail gesendet!
|
||||
</h2>
|
||||
<h2 className="text-xl font-semibold text-gray-900 mb-2">E-Mail gesendet!</h2>
|
||||
<p className="text-gray-500">
|
||||
Wir haben einen Login-Link an <strong>{email}</strong> gesendet.
|
||||
Bitte überprüfen Sie Ihr Postfach.
|
||||
@@ -69,15 +82,33 @@ export default function LoginPage() {
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
<h2 className="text-xl font-semibold text-gray-900 mb-6">
|
||||
Anmelden
|
||||
</h2>
|
||||
<h2 className="text-xl font-semibold text-gray-900 mb-6">Anmelden</h2>
|
||||
|
||||
{/* Mode toggle */}
|
||||
<div className="flex rounded-lg border border-gray-200 p-1 mb-6">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setMode('password')}
|
||||
className={`flex-1 py-1.5 text-sm rounded-md font-medium transition-colors ${
|
||||
mode === 'password' ? 'bg-brand-500 text-white' : 'text-gray-500 hover:text-gray-700'
|
||||
}`}
|
||||
>
|
||||
Passwort
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setMode('magic')}
|
||||
className={`flex-1 py-1.5 text-sm rounded-md font-medium transition-colors ${
|
||||
mode === 'magic' ? 'bg-brand-500 text-white' : 'text-gray-500 hover:text-gray-700'
|
||||
}`}
|
||||
>
|
||||
Magic Link
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleSubmit} className="space-y-4">
|
||||
<div>
|
||||
<label
|
||||
htmlFor="email"
|
||||
className="block text-sm font-medium text-gray-700 mb-1"
|
||||
>
|
||||
<label htmlFor="email" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
E-Mail-Adresse
|
||||
</label>
|
||||
<input
|
||||
@@ -91,10 +122,25 @@ export default function LoginPage() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
{mode === 'password' && (
|
||||
<div>
|
||||
<label htmlFor="password" className="block text-sm font-medium text-gray-700 mb-1">
|
||||
Passwort
|
||||
</label>
|
||||
<input
|
||||
id="password"
|
||||
type="password"
|
||||
required
|
||||
value={password}
|
||||
onChange={(e) => setPassword(e.target.value)}
|
||||
placeholder="••••••••"
|
||||
className="w-full px-4 py-2.5 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-brand-500 focus:border-transparent"
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{error && (
|
||||
<p className="text-sm text-red-600 bg-red-50 px-4 py-2 rounded-lg">
|
||||
{error}
|
||||
</p>
|
||||
<p className="text-sm text-red-600 bg-red-50 px-4 py-2 rounded-lg">{error}</p>
|
||||
)}
|
||||
|
||||
<button
|
||||
@@ -102,13 +148,19 @@ export default function LoginPage() {
|
||||
disabled={loading}
|
||||
className="w-full bg-brand-500 text-white py-2.5 px-4 rounded-lg font-medium hover:bg-brand-600 disabled:opacity-60 disabled:cursor-not-allowed transition-colors"
|
||||
>
|
||||
{loading ? 'Wird gesendet...' : 'Magic Link senden'}
|
||||
{loading
|
||||
? 'Bitte warten...'
|
||||
: mode === 'password'
|
||||
? 'Anmelden'
|
||||
: 'Magic Link senden'}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<p className="mt-4 text-center text-sm text-gray-500">
|
||||
Kein Passwort nötig — Sie erhalten einen Link per E-Mail.
|
||||
</p>
|
||||
{mode === 'password' && (
|
||||
<p className="mt-4 text-center text-xs text-gray-400">
|
||||
Demo: admin@demo.de / demo1234
|
||||
</p>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -7,13 +7,19 @@ import { sendMagicLinkEmail } from './email'
|
||||
|
||||
export const auth = betterAuth({
|
||||
database: prismaAdapter(prisma, {
|
||||
provider: 'postgresql',
|
||||
provider: 'sqlite',
|
||||
}),
|
||||
emailAndPassword: {
|
||||
enabled: true,
|
||||
},
|
||||
secret: process.env.BETTER_AUTH_SECRET!,
|
||||
baseURL: process.env.BETTER_AUTH_URL!,
|
||||
trustedOrigins: [
|
||||
process.env.NEXT_PUBLIC_APP_URL ?? 'http://localhost:3000',
|
||||
process.env.EXPO_PUBLIC_API_URL ?? 'http://localhost:3000',
|
||||
process.env.NEXT_PUBLIC_APP_URL ?? 'http://localhost:3032',
|
||||
process.env.EXPO_PUBLIC_API_URL ?? 'http://localhost:3032',
|
||||
'http://10.36.148.233:3032',
|
||||
'http://localhost:8081', // Expo dev client
|
||||
'http://10.36.148.233:8081',
|
||||
],
|
||||
plugins: [
|
||||
magicLink({
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { NextResponse } from 'next/server'
|
||||
import type { NextRequest } from 'next/server'
|
||||
|
||||
const PUBLIC_PATHS = ['/login', '/api/auth', '/api/trpc/stellen.listPublic']
|
||||
const PUBLIC_PATHS = ['/login', '/api/auth', '/api/trpc/stellen.listPublic', '/api/setup']
|
||||
|
||||
export function middleware(request: NextRequest) {
|
||||
const pathname = request.nextUrl.pathname
|
||||
|
||||
5
innungsapp/apps/admin/next-env.d.ts
vendored
Normal file
5
innungsapp/apps/admin/next-env.d.ts
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
/// <reference types="next" />
|
||||
/// <reference types="next/image-types/global" />
|
||||
|
||||
// NOTE: This file should not be edited
|
||||
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
|
||||
@@ -19,7 +19,7 @@
|
||||
"@trpc/server": "^11.0.0",
|
||||
"@tanstack/react-query": "^5.59.0",
|
||||
"better-auth": "^1.2.0",
|
||||
"next": "^15.0.0",
|
||||
"next": "15.3.4",
|
||||
"react": "^18.3.0",
|
||||
"react-dom": "^18.3.0",
|
||||
"zod": "^3.23.0",
|
||||
|
||||
@@ -124,6 +124,13 @@ export const membersRouter = router({
|
||||
where: { id: input.id, orgId: ctx.orgId },
|
||||
data: input.data,
|
||||
})
|
||||
// Keep user.name in sync when member name changes
|
||||
if (input.data.name) {
|
||||
const m = await ctx.prisma.member.findFirst({ where: { id: input.id }, select: { userId: true } })
|
||||
if (m?.userId) {
|
||||
await ctx.prisma.user.update({ where: { id: m.userId }, data: { name: input.data.name } })
|
||||
}
|
||||
}
|
||||
return member
|
||||
}),
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ import { NEWS_KATEGORIE_LABELS } from '@innungsapp/shared/types'
|
||||
import { useNewsList } from '@/hooks/useNews'
|
||||
import { useTermineListe } from '@/hooks/useTermine'
|
||||
import { useNewsReadStore } from '@/store/news.store'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
|
||||
// Helper to truncate text
|
||||
function getNewsExcerpt(value: string) {
|
||||
@@ -23,16 +24,18 @@ export default function HomeScreen() {
|
||||
const { data: newsItems = [] } = useNewsList()
|
||||
const { data: termine = [] } = useTermineListe(true)
|
||||
const readIds = useNewsReadStore((s) => s.readIds)
|
||||
const { data: me } = trpc.members.me.useQuery()
|
||||
const userName = me?.name ?? ''
|
||||
|
||||
const latestNews = newsItems.slice(0, 2)
|
||||
const upcomingEvents = termine.slice(0, 3)
|
||||
const unreadCount = newsItems.filter((item) => !(item.isRead || readIds.has(item.id))).length
|
||||
|
||||
const QUICK_ACTIONS = [
|
||||
{ label: 'Mitglieder', icon: 'people', color: '#003B7E', bg: '#E0F2FE', route: '/(app)/members' },
|
||||
{ label: 'Termine', icon: 'calendar', color: '#B45309', bg: '#FEF3C7', route: '/(app)/termine' },
|
||||
{ label: 'Stellen', icon: 'briefcase', color: '#059669', bg: '#D1FAE5', route: '/(app)/stellen' },
|
||||
{ label: 'Profil', icon: 'person', color: '#4F46E5', bg: '#E0E7FF', route: '/(app)/profil' },
|
||||
{ label: 'Mitglieder', icon: 'people-circle', color: '#2563EB', bg: '#DBEAFE', route: '/(app)/members' },
|
||||
{ label: 'Termine', icon: 'alarm', color: '#EA580C', bg: '#FFEDD5', route: '/(app)/termine' },
|
||||
{ label: 'Stellen', icon: 'construct', color: '#0F766E', bg: '#CCFBF1', route: '/(app)/stellen' },
|
||||
{ label: 'Aktuelles', icon: 'megaphone', color: '#BE185D', bg: '#FCE7F3', route: '/(app)/news' },
|
||||
]
|
||||
|
||||
return (
|
||||
@@ -53,7 +56,7 @@ export default function HomeScreen() {
|
||||
</View>
|
||||
<View>
|
||||
<Text style={styles.greeting}>Willkommen zurück,</Text>
|
||||
<Text style={styles.username}>Demo Admin</Text>
|
||||
<Text style={styles.username}>{userName}</Text>
|
||||
</View>
|
||||
</View>
|
||||
|
||||
@@ -461,4 +464,3 @@ const styles = StyleSheet.create({
|
||||
fontWeight: '500',
|
||||
},
|
||||
})
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ import { View, Text, ScrollView, TouchableOpacity, Alert, StyleSheet } from 'rea
|
||||
import { SafeAreaView } from 'react-native-safe-area-context'
|
||||
import { Ionicons } from '@expo/vector-icons'
|
||||
import { useAuth } from '@/hooks/useAuth'
|
||||
import { MOCK_MEMBER_ME } from '@/lib/mock-data'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
|
||||
type Item = {
|
||||
label: string
|
||||
@@ -20,9 +20,10 @@ const MENU_ITEMS: Item[] = [
|
||||
|
||||
export default function ProfilScreen() {
|
||||
const { signOut } = useAuth()
|
||||
const member = MOCK_MEMBER_ME
|
||||
const { data: me } = trpc.members.me.useQuery()
|
||||
const name = me?.name ?? ''
|
||||
|
||||
const initials = member.name
|
||||
const initials = name
|
||||
.split(' ')
|
||||
.slice(0, 2)
|
||||
.map((chunk) => chunk[0]?.toUpperCase() ?? '')
|
||||
@@ -42,7 +43,7 @@ export default function ProfilScreen() {
|
||||
<Ionicons name="settings-outline" size={15} color="#64748B" />
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
<Text style={styles.name}>{member.name}</Text>
|
||||
<Text style={styles.name}>{name}</Text>
|
||||
<Text style={styles.role}>Innungsgeschaeftsfuehrer</Text>
|
||||
<View style={styles.badgesRow}>
|
||||
<View style={styles.statusBadge}>
|
||||
|
||||
@@ -7,29 +7,40 @@ import { useRouter } from 'expo-router'
|
||||
import { SafeAreaView } from 'react-native-safe-area-context'
|
||||
import { Ionicons } from '@expo/vector-icons'
|
||||
import { authClient } from '@/lib/auth-client'
|
||||
import { useAuthStore } from '@/store/auth.store'
|
||||
|
||||
export default function LoginScreen() {
|
||||
const router = useRouter()
|
||||
const setSession = useAuthStore((s) => s.setSession)
|
||||
const [email, setEmail] = useState('')
|
||||
const [password, setPassword] = useState('')
|
||||
const [loading, setLoading] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
|
||||
const canSubmit = email.trim().length > 0 && !loading
|
||||
const canSubmit = email.trim().length > 0 && password.length > 0 && !loading
|
||||
|
||||
async function handleSendLink() {
|
||||
if (!email.trim()) return
|
||||
async function handleLogin() {
|
||||
if (!canSubmit) return
|
||||
setLoading(true)
|
||||
setError('')
|
||||
const result = await authClient.signIn.magicLink({
|
||||
|
||||
const result = await authClient.signIn.email({
|
||||
email: email.trim().toLowerCase(),
|
||||
callbackURL: '/home',
|
||||
password,
|
||||
})
|
||||
setLoading(false)
|
||||
|
||||
if (result.error) {
|
||||
setError(result.error.message ?? 'Ein Fehler ist aufgetreten.')
|
||||
} else {
|
||||
router.push({ pathname: '/(auth)/check-email', params: { email } })
|
||||
setError(result.error.message ?? 'E-Mail oder Passwort falsch.')
|
||||
setLoading(false)
|
||||
return
|
||||
}
|
||||
|
||||
const token = (result.data as any)?.session?.token
|
||||
const user = (result.data as any)?.user
|
||||
await setSession(user ? { user } : null, token)
|
||||
|
||||
setLoading(false)
|
||||
router.replace('/(app)/home' as never)
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -60,7 +71,21 @@ export default function LoginScreen() {
|
||||
autoCorrect={false}
|
||||
value={email}
|
||||
onChangeText={setEmail}
|
||||
onSubmitEditing={handleSendLink}
|
||||
returnKeyType="next"
|
||||
/>
|
||||
</View>
|
||||
|
||||
<Text style={[styles.inputLabel, { marginTop: 4 }]}>Passwort</Text>
|
||||
<View style={styles.inputWrap}>
|
||||
<Ionicons name="lock-closed-outline" size={18} color="#94A3B8" />
|
||||
<TextInput
|
||||
style={styles.input}
|
||||
placeholder="••••••••"
|
||||
placeholderTextColor="#94A3B8"
|
||||
secureTextEntry
|
||||
value={password}
|
||||
onChangeText={setPassword}
|
||||
onSubmitEditing={handleLogin}
|
||||
returnKeyType="go"
|
||||
/>
|
||||
</View>
|
||||
@@ -72,7 +97,7 @@ export default function LoginScreen() {
|
||||
) : null}
|
||||
|
||||
<TouchableOpacity
|
||||
onPress={handleSendLink}
|
||||
onPress={handleLogin}
|
||||
disabled={!canSubmit}
|
||||
style={[styles.submitBtn, !canSubmit && styles.submitBtnDisabled]}
|
||||
activeOpacity={0.85}
|
||||
@@ -81,7 +106,7 @@ export default function LoginScreen() {
|
||||
<ActivityIndicator color="#FFFFFF" />
|
||||
) : (
|
||||
<View style={styles.submitContent}>
|
||||
<Text style={styles.submitLabel}>Login-Link senden</Text>
|
||||
<Text style={styles.submitLabel}>Anmelden</Text>
|
||||
<Ionicons name="arrow-forward" size={16} color="#FFFFFF" />
|
||||
</View>
|
||||
)}
|
||||
@@ -89,7 +114,7 @@ export default function LoginScreen() {
|
||||
</View>
|
||||
|
||||
<Text style={styles.hint}>
|
||||
Noch kein Zugang? Kontaktieren Sie Ihre Innungsgeschaeftsstelle.
|
||||
Noch kein Zugang? Kontaktieren Sie Ihre Innungsgeschäftsstelle.
|
||||
</Text>
|
||||
</View>
|
||||
</KeyboardAvoidingView>
|
||||
@@ -98,109 +123,38 @@ export default function LoginScreen() {
|
||||
}
|
||||
|
||||
const styles = StyleSheet.create({
|
||||
safeArea: {
|
||||
flex: 1,
|
||||
backgroundColor: '#FFFFFF',
|
||||
},
|
||||
keyboardView: {
|
||||
flex: 1,
|
||||
},
|
||||
content: {
|
||||
flex: 1,
|
||||
justifyContent: 'center',
|
||||
paddingHorizontal: 24,
|
||||
},
|
||||
logoSection: {
|
||||
alignItems: 'center',
|
||||
marginBottom: 40,
|
||||
},
|
||||
safeArea: { flex: 1, backgroundColor: '#FFFFFF' },
|
||||
keyboardView: { flex: 1 },
|
||||
content: { flex: 1, justifyContent: 'center', paddingHorizontal: 24 },
|
||||
logoSection: { alignItems: 'center', marginBottom: 40 },
|
||||
logoBox: {
|
||||
width: 64,
|
||||
height: 64,
|
||||
backgroundColor: '#003B7E',
|
||||
borderRadius: 18,
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
marginBottom: 16,
|
||||
},
|
||||
logoLetter: {
|
||||
color: '#FFFFFF',
|
||||
fontSize: 30,
|
||||
fontWeight: '900',
|
||||
},
|
||||
appName: {
|
||||
fontSize: 30,
|
||||
fontWeight: '800',
|
||||
color: '#0F172A',
|
||||
letterSpacing: -0.6,
|
||||
marginBottom: 4,
|
||||
},
|
||||
tagline: {
|
||||
fontSize: 14,
|
||||
color: '#64748B',
|
||||
textAlign: 'center',
|
||||
},
|
||||
form: {
|
||||
gap: 12,
|
||||
},
|
||||
inputLabel: {
|
||||
fontSize: 14,
|
||||
fontWeight: '700',
|
||||
color: '#334155',
|
||||
width: 64, height: 64, backgroundColor: '#003B7E',
|
||||
borderRadius: 18, alignItems: 'center', justifyContent: 'center', marginBottom: 16,
|
||||
},
|
||||
logoLetter: { color: '#FFFFFF', fontSize: 30, fontWeight: '900' },
|
||||
appName: { fontSize: 30, fontWeight: '800', color: '#0F172A', letterSpacing: -0.6, marginBottom: 4 },
|
||||
tagline: { fontSize: 14, color: '#64748B', textAlign: 'center' },
|
||||
form: { gap: 8 },
|
||||
inputLabel: { fontSize: 14, fontWeight: '700', color: '#334155' },
|
||||
inputWrap: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
backgroundColor: '#F8FAFC',
|
||||
borderRadius: 14,
|
||||
borderWidth: 1,
|
||||
borderColor: '#E2E8F0',
|
||||
paddingHorizontal: 12,
|
||||
gap: 8,
|
||||
},
|
||||
input: {
|
||||
flex: 1,
|
||||
paddingVertical: 13,
|
||||
color: '#0F172A',
|
||||
fontSize: 15,
|
||||
flexDirection: 'row', alignItems: 'center',
|
||||
backgroundColor: '#F8FAFC', borderRadius: 14,
|
||||
borderWidth: 1, borderColor: '#E2E8F0',
|
||||
paddingHorizontal: 12, gap: 8,
|
||||
},
|
||||
input: { flex: 1, paddingVertical: 13, color: '#0F172A', fontSize: 15 },
|
||||
errorBox: {
|
||||
backgroundColor: '#FEF2F2',
|
||||
borderWidth: 1,
|
||||
borderColor: '#FECACA',
|
||||
borderRadius: 12,
|
||||
paddingHorizontal: 14,
|
||||
paddingVertical: 10,
|
||||
},
|
||||
errorText: {
|
||||
color: '#B91C1C',
|
||||
fontSize: 13,
|
||||
backgroundColor: '#FEF2F2', borderWidth: 1,
|
||||
borderColor: '#FECACA', borderRadius: 12,
|
||||
paddingHorizontal: 14, paddingVertical: 10,
|
||||
},
|
||||
errorText: { color: '#B91C1C', fontSize: 13 },
|
||||
submitBtn: {
|
||||
backgroundColor: '#003B7E',
|
||||
borderRadius: 14,
|
||||
paddingVertical: 14,
|
||||
alignItems: 'center',
|
||||
marginTop: 4,
|
||||
},
|
||||
submitBtnDisabled: {
|
||||
backgroundColor: '#CBD5E1',
|
||||
},
|
||||
submitContent: {
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
gap: 6,
|
||||
},
|
||||
submitLabel: {
|
||||
color: '#FFFFFF',
|
||||
fontWeight: '700',
|
||||
fontSize: 15,
|
||||
},
|
||||
hint: {
|
||||
marginTop: 24,
|
||||
textAlign: 'center',
|
||||
color: '#64748B',
|
||||
fontSize: 13,
|
||||
lineHeight: 18,
|
||||
backgroundColor: '#003B7E', borderRadius: 14,
|
||||
paddingVertical: 14, alignItems: 'center', marginTop: 8,
|
||||
},
|
||||
submitBtnDisabled: { backgroundColor: '#CBD5E1' },
|
||||
submitContent: { flexDirection: 'row', alignItems: 'center', gap: 6 },
|
||||
submitLabel: { color: '#FFFFFF', fontWeight: '700', fontSize: 15 },
|
||||
hint: { marginTop: 24, textAlign: 'center', color: '#64748B', fontSize: 13, lineHeight: 18 },
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@ import '../global.css'
|
||||
import { useEffect } from 'react'
|
||||
import { Stack, SplashScreen } from 'expo-router'
|
||||
import { useAuthStore } from '@/store/auth.store'
|
||||
import { TRPCProvider } from '@/lib/trpc'
|
||||
|
||||
SplashScreen.preventAutoHideAsync()
|
||||
|
||||
@@ -16,11 +17,13 @@ export default function RootLayout() {
|
||||
if (!isInitialized) return null
|
||||
|
||||
return (
|
||||
<Stack screenOptions={{ headerShown: false }}>
|
||||
<Stack.Screen name="index" />
|
||||
<Stack.Screen name="(auth)" options={{ animation: 'fade' }} />
|
||||
<Stack.Screen name="(app)" options={{ animation: 'fade' }} />
|
||||
<Stack.Screen name="stellen-public/index" />
|
||||
</Stack>
|
||||
<TRPCProvider>
|
||||
<Stack screenOptions={{ headerShown: false }}>
|
||||
<Stack.Screen name="index" />
|
||||
<Stack.Screen name="(auth)" options={{ animation: 'fade' }} />
|
||||
<Stack.Screen name="(app)" options={{ animation: 'fade' }} />
|
||||
<Stack.Screen name="stellen-public/index" />
|
||||
</Stack>
|
||||
</TRPCProvider>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -12,10 +12,7 @@ export function useAuth() {
|
||||
|
||||
return {
|
||||
session,
|
||||
orgId: 'org-1',
|
||||
role: 'member' as const,
|
||||
isAuthenticated: true, // Mock: immer eingeloggt
|
||||
isAdmin: false,
|
||||
isAuthenticated: !!session,
|
||||
signOut: handleSignOut,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,31 +1,25 @@
|
||||
import { MOCK_MEMBERS } from '@/lib/mock-data'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
import { useMembersFilterStore } from '@/store/members.store'
|
||||
|
||||
export function useMembersList() {
|
||||
const search = useMembersFilterStore((s) => s.search)
|
||||
const nurAusbildungsbetriebe = useMembersFilterStore((s) => s.nurAusbildungsbetriebe)
|
||||
|
||||
let data = MOCK_MEMBERS.filter((m) => m.status === 'aktiv')
|
||||
const { data, isLoading, refetch, isFetching } = trpc.members.list.useQuery({
|
||||
search: search || undefined,
|
||||
status: 'aktiv',
|
||||
ausbildungsbetrieb: nurAusbildungsbetriebe || undefined,
|
||||
})
|
||||
|
||||
if (search) {
|
||||
const q = search.toLowerCase()
|
||||
data = data.filter(
|
||||
(m) =>
|
||||
m.name.toLowerCase().includes(q) ||
|
||||
m.betrieb.toLowerCase().includes(q) ||
|
||||
m.ort.toLowerCase().includes(q) ||
|
||||
m.sparte.toLowerCase().includes(q)
|
||||
)
|
||||
return {
|
||||
data: data ?? [],
|
||||
isLoading,
|
||||
refetch,
|
||||
isRefetching: isFetching,
|
||||
}
|
||||
|
||||
if (nurAusbildungsbetriebe) {
|
||||
data = data.filter((m) => m.istAusbildungsbetrieb)
|
||||
}
|
||||
|
||||
return { data, isLoading: false, refetch: () => {}, isRefetching: false }
|
||||
}
|
||||
|
||||
export function useMemberDetail(id: string) {
|
||||
const data = MOCK_MEMBERS.find((m) => m.id === id) ?? null
|
||||
return { data, isLoading: false }
|
||||
const { data, isLoading } = trpc.members.byId.useQuery({ id })
|
||||
return { data: data ?? null, isLoading }
|
||||
}
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
import { useState } from 'react'
|
||||
import { MOCK_NEWS } from '@/lib/mock-data'
|
||||
import { useNewsReadStore } from '@/store/news.store'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
|
||||
export function useNewsList(kategorie?: string) {
|
||||
const localReadIds = useNewsReadStore((s) => s.readIds)
|
||||
const filtered = kategorie
|
||||
? MOCK_NEWS.filter((n) => n.kategorie === kategorie)
|
||||
: MOCK_NEWS
|
||||
const { data, isLoading, refetch, isFetching } = trpc.news.list.useQuery({
|
||||
kategorie: kategorie || undefined,
|
||||
})
|
||||
|
||||
const data = filtered.map((n) => ({
|
||||
...n,
|
||||
isRead: n.isRead || localReadIds.has(n.id),
|
||||
}))
|
||||
|
||||
return { data, isLoading: false, refetch: () => {}, isRefetching: false }
|
||||
return {
|
||||
data: data ?? [],
|
||||
isLoading,
|
||||
refetch,
|
||||
isRefetching: isFetching,
|
||||
}
|
||||
}
|
||||
|
||||
export function useNewsDetail(id: string) {
|
||||
const markRead = useNewsReadStore((s) => s.markRead)
|
||||
const news = MOCK_NEWS.find((n) => n.id === id) ?? null
|
||||
const utils = trpc.useUtils()
|
||||
const { data, isLoading } = trpc.news.byId.useQuery({ id })
|
||||
|
||||
const markReadMutation = trpc.news.markRead.useMutation()
|
||||
|
||||
function onOpen() {
|
||||
markRead(id)
|
||||
markReadMutation.mutate({ newsId: id })
|
||||
utils.news.list.invalidate()
|
||||
}
|
||||
|
||||
return { data: news, isLoading: false, onOpen }
|
||||
return { data: data ?? null, isLoading, onOpen }
|
||||
}
|
||||
|
||||
@@ -1,13 +1,20 @@
|
||||
import { MOCK_STELLEN } from '@/lib/mock-data'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
|
||||
export function useStellenListe(opts?: { sparte?: string; lehrjahr?: string }) {
|
||||
let data = MOCK_STELLEN.filter((s) => s.aktiv)
|
||||
if (opts?.sparte) data = data.filter((s) => s.sparte === opts.sparte)
|
||||
if (opts?.lehrjahr) data = data.filter((s) => s.lehrjahr === opts.lehrjahr)
|
||||
return { data, isLoading: false, refetch: () => {}, isRefetching: false }
|
||||
const { data, isLoading, refetch, isFetching } = trpc.stellen.listPublic.useQuery({
|
||||
sparte: opts?.sparte,
|
||||
lehrjahr: opts?.lehrjahr,
|
||||
})
|
||||
|
||||
return {
|
||||
data: data ?? [],
|
||||
isLoading,
|
||||
refetch,
|
||||
isRefetching: isFetching,
|
||||
}
|
||||
}
|
||||
|
||||
export function useStelleDetail(id: string) {
|
||||
const data = MOCK_STELLEN.find((s) => s.id === id) ?? null
|
||||
return { data, isLoading: false }
|
||||
const { data, isLoading } = trpc.stellen.byId.useQuery({ id })
|
||||
return { data: data ?? null, isLoading }
|
||||
}
|
||||
|
||||
@@ -1,33 +1,32 @@
|
||||
import { useState } from 'react'
|
||||
import { MOCK_TERMINE } from '@/lib/mock-data'
|
||||
import { trpc } from '@/lib/trpc'
|
||||
|
||||
export function useTermineListe(upcoming = true) {
|
||||
const now = new Date()
|
||||
const data = MOCK_TERMINE.filter((t) =>
|
||||
upcoming ? t.datum >= now : t.datum < now
|
||||
).sort((a, b) =>
|
||||
upcoming ? a.datum.getTime() - b.datum.getTime() : b.datum.getTime() - a.datum.getTime()
|
||||
)
|
||||
return { data, isLoading: false, refetch: () => {}, isRefetching: false }
|
||||
const { data, isLoading, refetch, isFetching } = trpc.termine.list.useQuery({ upcoming })
|
||||
|
||||
return {
|
||||
data: data ?? [],
|
||||
isLoading,
|
||||
refetch,
|
||||
isRefetching: isFetching,
|
||||
}
|
||||
}
|
||||
|
||||
export function useTerminDetail(id: string) {
|
||||
const data = MOCK_TERMINE.find((t) => t.id === id) ?? null
|
||||
return { data, isLoading: false }
|
||||
const { data, isLoading } = trpc.termine.byId.useQuery({ id })
|
||||
return { data: data ?? null, isLoading }
|
||||
}
|
||||
|
||||
export function useToggleAnmeldung() {
|
||||
const [isPending, setIsPending] = useState(false)
|
||||
const utils = trpc.useUtils()
|
||||
const mutation = trpc.termine.toggleAnmeldung.useMutation({
|
||||
onSuccess: () => {
|
||||
utils.termine.list.invalidate()
|
||||
utils.termine.byId.invalidate()
|
||||
},
|
||||
})
|
||||
|
||||
function mutate({ terminId }: { terminId: string }) {
|
||||
setIsPending(true)
|
||||
const termin = MOCK_TERMINE.find((t) => t.id === terminId)
|
||||
if (termin) {
|
||||
termin.isAngemeldet = !termin.isAngemeldet
|
||||
termin.teilnehmerAnzahl += termin.isAngemeldet ? 1 : -1
|
||||
}
|
||||
setTimeout(() => setIsPending(false), 300)
|
||||
return {
|
||||
mutate: ({ terminId }: { terminId: string }) => mutation.mutate({ terminId }),
|
||||
isPending: mutation.isPending,
|
||||
}
|
||||
|
||||
return { mutate, isPending }
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { createAuthClient } from 'better-auth/react'
|
||||
import { magicLinkClient } from 'better-auth/client/plugins'
|
||||
import Constants from 'expo-constants'
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage'
|
||||
|
||||
const apiUrl =
|
||||
Constants.expoConfig?.extra?.apiUrl ??
|
||||
@@ -10,4 +11,15 @@ const apiUrl =
|
||||
export const authClient = createAuthClient({
|
||||
baseURL: apiUrl,
|
||||
plugins: [magicLinkClient()],
|
||||
fetchOptions: {
|
||||
customFetchImpl: async (url, options) => {
|
||||
const token = await AsyncStorage.getItem('better-auth-session')
|
||||
const headers = new Headers((options?.headers as HeadersInit) ?? {})
|
||||
headers.set('origin', apiUrl)
|
||||
if (token) {
|
||||
headers.set('cookie', `better-auth.session_token=${token}`)
|
||||
}
|
||||
return fetch(url, { ...options, headers })
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { create } from 'zustand'
|
||||
import { MOCK_MEMBER_ME } from '@/lib/mock-data'
|
||||
import { authClient } from '@/lib/auth-client'
|
||||
import AsyncStorage from '@react-native-async-storage/async-storage'
|
||||
|
||||
interface Session {
|
||||
user: { id: string; email: string; name: string }
|
||||
@@ -9,26 +10,48 @@ interface AuthState {
|
||||
session: Session | null
|
||||
isInitialized: boolean
|
||||
initialize: () => Promise<void>
|
||||
setSession: (session: Session | null, token?: string) => Promise<void>
|
||||
signOut: () => Promise<void>
|
||||
}
|
||||
|
||||
export const useAuthStore = create<AuthState>((set) => ({
|
||||
// Mock: direkt eingeloggt
|
||||
session: {
|
||||
user: {
|
||||
id: MOCK_MEMBER_ME.userId!,
|
||||
email: MOCK_MEMBER_ME.email,
|
||||
name: MOCK_MEMBER_ME.name,
|
||||
},
|
||||
},
|
||||
isInitialized: true,
|
||||
session: null,
|
||||
isInitialized: false,
|
||||
|
||||
initialize: async () => {
|
||||
// Mock: nichts zu tun
|
||||
set({ isInitialized: true })
|
||||
try {
|
||||
// Check if we have a stored token and validate it
|
||||
const token = await AsyncStorage.getItem('better-auth-session')
|
||||
if (!token) {
|
||||
set({ session: null, isInitialized: true })
|
||||
return
|
||||
}
|
||||
// authClient now sends the token via cookie header (see auth-client.ts)
|
||||
const result = await authClient.getSession()
|
||||
if (result?.data?.user) {
|
||||
set({
|
||||
session: { user: result.data.user },
|
||||
isInitialized: true,
|
||||
})
|
||||
} else {
|
||||
await AsyncStorage.removeItem('better-auth-session')
|
||||
set({ session: null, isInitialized: true })
|
||||
}
|
||||
} catch {
|
||||
set({ session: null, isInitialized: true })
|
||||
}
|
||||
},
|
||||
|
||||
setSession: async (session, token) => {
|
||||
if (token) {
|
||||
await AsyncStorage.setItem('better-auth-session', token)
|
||||
}
|
||||
set({ session })
|
||||
},
|
||||
|
||||
signOut: async () => {
|
||||
await authClient.signOut()
|
||||
await AsyncStorage.removeItem('better-auth-session')
|
||||
set({ session: null })
|
||||
},
|
||||
}))
|
||||
|
||||
Reference in New Issue
Block a user