Ich habe noch keinen Account
+{t("noAccount")}
router.push("/register/user")} > - Sign Up + {t("signUp")}
+ {new Date(date).toLocaleDateString("de-DE", { + day: "2-digit", + month: "2-digit", + year: "numeric", + })} +
{timeFrom} - {timeTo}
diff --git a/src/modules/courses/ui/views/course-list-view.tsx b/src/modules/courses/ui/views/course-list-view.tsx index 7e42c8f..c6f4c41 100644 --- a/src/modules/courses/ui/views/course-list-view.tsx +++ b/src/modules/courses/ui/views/course-list-view.tsx @@ -411,6 +411,7 @@ const CourseListView = ({ courseId={course.id} courseName={course.name} room={roomsMap[course.room] || course.room} + date={course.date} timeFrom={course.timeFrom} timeTo={course.timeTo} currentParticipants={course._count?.bookings || 0} diff --git a/src/modules/settings/actions/personal-settings-actions.ts b/src/modules/settings/actions/personal-settings-actions.ts index 968fe9f..c6f0c94 100644 --- a/src/modules/settings/actions/personal-settings-actions.ts +++ b/src/modules/settings/actions/personal-settings-actions.ts @@ -177,7 +177,13 @@ export async function updatePassword( const { error } = await supabase.auth.updateUser({ password: newPassword }); if (error) { - return { success: false, error: error.message }; + if (error.message.includes("different from the old password")) { + return { + success: false, + error: "Das neue Passwort muss sich vom aktuellen Passwort unterscheiden.", + }; + } + return { success: false, error: "Fehler beim Aktualisieren des Passworts." }; } return { success: true }; diff --git a/src/modules/settings/ui/components/BusinessSettingsForm.tsx b/src/modules/settings/ui/components/BusinessSettingsForm.tsx index bdc9bce..105ea2c 100644 --- a/src/modules/settings/ui/components/BusinessSettingsForm.tsx +++ b/src/modules/settings/ui/components/BusinessSettingsForm.tsx @@ -2,11 +2,26 @@ import { type ReactNode, useState, useTransition } from "react"; import InputComponent from "@/src/components/layout/InputComponent"; +import AddressAutocompleteComponent, { + ParsedAddress, +} from "@/src/components/layout/AddressAutocompleteComponent"; import { Button } from "@/src/components/ui/button"; import { updateBusinessInfo } from "../../actions/business-settings-actions"; import { updateProfileInfo } from "../../actions/personal-settings-actions"; import { toast } from "sonner"; +// Parses "Musterstraße 1, 12345 Musterstadt" (the format used at registration) +// back into its parts so the address can be edited via AddressAutocompleteComponent. +function parseAddress(address: string): ParsedAddress { + const [streetPart, rest = ""] = address.split(",").map((part) => part.trim()); + const match = rest.match(/^(\d{4,5})\s*(.*)$/); + return { + street: streetPart ?? "", + plz: match?.[1] ?? "", + place: match?.[2] ?? rest, + }; +} + export type BusinessSettingsFormProps = { businessId: string; name: string; @@ -50,7 +65,10 @@ const BusinessSettingsForm = ({ }: BusinessSettingsFormProps) => { const [pending, startTransition] = useTransition(); - const [address, setAddress] = useState(initialAddress); + const initialParsed = parseAddress(initialAddress); + const [street, setStreet] = useState(initialParsed.street); + const [plz, setPlz] = useState(initialParsed.plz); + const [place, setPlace] = useState(initialParsed.place); const [email, setEmail] = useState(initialEmail); const [title, setTitle] = useState(initialTitle); const [ustId, setUstId] = useState(initialUstId ?? ""); @@ -60,6 +78,7 @@ const BusinessSettingsForm = ({ const handleBusinessSave = () => { startTransition(async () => { try { + const address = `${street}, ${plz} ${place}`; const result = await updateBusinessInfo({ businessId, address, @@ -119,14 +138,19 @@ const BusinessSettingsForm = ({ value={title} onChange={(e) => setTitle(e.target.value)} /> -