Sven/muh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add customer registration and deployment updates

Browse Source
This commit is contained in:
Sven Carstensen
2026-03-12 16:02:16 +01:00
parent fb8e3c8ef6
commit 8ebb4d06e5
23 changed files with 851 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.dockerignore Normal file
View File

@@ -0,0 +1,8 @@
.git
.gitignore
.DS_Store
.vscode
backend/target
frontend/dist
frontend/node_modules

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@ backend/target/
frontend/node_modules/
frontend/dist/
.DS_Store
.env

36
Dockerfile Normal file
View File

@@ -0,0 +1,36 @@
FROM node:20-alpine AS frontend-build
WORKDIR /build/frontend
ARG VITE_API_URL=/api
ENV VITE_API_URL=${VITE_API_URL}
COPY frontend/package*.json ./
RUN npm ci
COPY frontend/ ./
RUN npm run build
FROM maven:3.9.11-eclipse-temurin-17 AS backend-build
WORKDIR /build/backend
COPY backend/pom.xml ./
RUN mvn -B -q -DskipTests dependency:go-offline
COPY backend/ ./
COPY --from=frontend-build /build/frontend/dist ./src/main/resources/static
RUN mvn -B -q -DskipTests package
FROM eclipse-temurin:17-jre-alpine AS runtime
WORKDIR /app
RUN addgroup -S spring && adduser -S spring -G spring
COPY --from=backend-build /build/backend/target/muh-backend-0.0.1-SNAPSHOT.jar /app/app.jar
USER spring:spring
EXPOSE 8090
ENTRYPOINT ["java", "-jar", "/app/app.jar"]

41
README.md
View File

@@ -10,18 +10,26 @@ Therapieempfehlungen sowie Verwaltungs- und Portalaufgaben.
## Konfiguration
MongoDB ist bereits im Backend vorkonfiguriert:
Die Anwendung liest Konfigurationswerte aus einer `.env` im Projektverzeichnis
oder aus Umgebungsvariablen.
- `mongodb://192.168.180.25:27017/muh`
Die lokale `.env` ist in `.gitignore` eingetragen und sollte nicht mit echten Zugangsdaten committed werden.
MongoDB:
- `MUH_MONGODB_URL`
- `MUH_MONGODB_USERNAME`
- `MUH_MONGODB_PASSWORD`
Optional fuer echten Mailversand im Portal:
- `MUH_MAIL_ENABLED=true`
- `MUH_MAIL_FROM=...`
- `MUH_MAIL_HOST=...`
- `MUH_MAIL_PORT=587`
- `MUH_MAIL_USERNAME=...`
- `MUH_MAIL_PASSWORD=...`
- `MUH_MAIL_FROM=...`
- `MUH_MAIL_PROTOCOL=smtp`
- `MUH_MAIL_AUTH=true`
- `MUH_MAIL_STARTTLS=true`
@@ -52,13 +60,34 @@ Frontend-URL:
Optional kann die API-URL im Frontend ueber `VITE_API_URL` gesetzt werden.
## Docker Deployment
Produktions-Image bauen:
```bash
docker build -t muh-app .
```
Container starten:
```bash
docker run --rm --env-file .env -p 8090:8090 muh-app
```
Die Anwendung ist danach unter `http://localhost:8090` erreichbar.
Hinweis:
- Das Dockerfile baut das React-Frontend und das Spring-Boot-Backend in einem Image.
- Das Frontend wird im Container direkt ueber Spring Boot ausgeliefert.
- API-Aufrufe laufen in Produktion relativ ueber `/api`.
## Anmeldung
Es gibt jetzt drei Varianten:
Es gibt jetzt zwei Varianten:
- Schnelllogin ueber Benutzerkuerzel
- Login ueber E-Mail oder Benutzername plus Passwort
- Registrierung eines neuen Kundenkontos ueber Firmenname, Adresse, E-Mail und Passwort
- Registrierung eines neuen Kundenkontos ueber Firmenname, Strasse, Hausnummer, PLZ, Ort, E-Mail und Passwort
Vordefinierter Admin:

37
backend/src/main/java/de/svencarstensen/muh/config/MongoConfig.java Normal file
View File

@@ -0,0 +1,37 @@
package de.svencarstensen.muh.config;
import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
import com.mongodb.MongoCredential;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.StringUtils;
@Configuration
public class MongoConfig {
@Bean
MongoClient mongoClient(
@Value("${muh.mongodb.url}") String mongoUrl,
@Value("${muh.mongodb.username:}") String username,
@Value("${muh.mongodb.password:}") String password
) {
ConnectionString connectionString = new ConnectionString(mongoUrl);
MongoClientSettings.Builder builder = MongoClientSettings.builder()
.applyConnectionString(connectionString);
if (StringUtils.hasText(username)) {
String authDatabase = connectionString.getDatabase() == null ? "admin" : connectionString.getDatabase();
builder.credential(MongoCredential.createCredential(
username.trim(),
authDatabase,
password == null ? new char[0] : password.toCharArray()
));
}
return MongoClients.create(builder.build());
}
}

5
backend/src/main/java/de/svencarstensen/muh/domain/AppUser.java
View File

@@ -12,7 +12,12 @@ public record AppUser(
String displayName,
String companyName,
String address,
String street,
String houseNumber,
String postalCode,
String city,
String email,
String phoneNumber,
String portalLogin,
String passwordHash,
boolean active,

150
backend/src/main/java/de/svencarstensen/muh/service/CatalogService.java
View File

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.server.ResponseStatusException;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -383,7 +384,8 @@ public class CatalogService {
.toList();
}
public UserRow createOrUpdateUser(UserMutation mutation) {
public UserRow createOrUpdateUser(String actorId, UserMutation mutation) {
requireAdminActor(actorId);
if (isBlank(mutation.displayName()) || isBlank(mutation.code())) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Benutzername und Kürzel sind erforderlich");
}
@@ -396,11 +398,16 @@ public class CatalogService {
mutation.displayName().trim(),
blankToNull(mutation.companyName()),
blankToNull(mutation.address()),
null,
null,
null,
null,
normalizeEmail(mutation.email()),
null,
blankToNull(mutation.portalLogin()),
encodeIfPresent(mutation.password()),
mutation.active(),
Optional.ofNullable(mutation.role()).orElse(UserRole.APP),
normalizeManagedRole(mutation.role()),
now,
now
));
@@ -415,11 +422,16 @@ public class CatalogService {
mutation.displayName().trim(),
blankToNull(mutation.companyName()),
blankToNull(mutation.address()),
existing.street(),
existing.houseNumber(),
existing.postalCode(),
existing.city(),
normalizeEmail(mutation.email()),
existing.phoneNumber(),
blankToNull(mutation.portalLogin()),
isBlank(mutation.password()) ? existing.passwordHash() : passwordEncoder.encode(mutation.password()),
mutation.active(),
Optional.ofNullable(mutation.role()).orElse(existing.role()),
mutation.role() == null ? normalizeStoredRole(existing.role()) : normalizeManagedRole(mutation.role()),
existing.createdAt(),
now
));
@@ -442,7 +454,12 @@ public class CatalogService {
existing.displayName(),
existing.companyName(),
existing.address(),
existing.street(),
existing.houseNumber(),
existing.postalCode(),
existing.city(),
existing.email(),
existing.phoneNumber(),
existing.portalLogin(),
passwordEncoder.encode(newPassword),
existing.active(),
@@ -473,8 +490,18 @@ public class CatalogService {
}
public UserOption registerCustomer(RegistrationMutation mutation) {
if (isBlank(mutation.companyName()) || isBlank(mutation.address()) || isBlank(mutation.email()) || isBlank(mutation.password())) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Firmenname, Adresse, E-Mail und Passwort sind erforderlich");
if (isBlank(mutation.companyName())
|| isBlank(mutation.street())
|| isBlank(mutation.houseNumber())
|| isBlank(mutation.postalCode())
|| isBlank(mutation.city())
|| isBlank(mutation.email())
|| isBlank(mutation.phoneNumber())
|| isBlank(mutation.password())) {
throw new ResponseStatusException(
HttpStatus.BAD_REQUEST,
"Firmenname, Strasse, Hausnummer, PLZ, Ort, E-Mail, Telefonnummer und Passwort sind erforderlich"
);
}
String normalizedEmail = normalizeEmail(mutation.email());
@@ -483,7 +510,12 @@ public class CatalogService {
}
String companyName = mutation.companyName().trim();
String address = mutation.address().trim();
String street = mutation.street().trim();
String houseNumber = mutation.houseNumber().trim();
String postalCode = mutation.postalCode().trim();
String city = mutation.city().trim();
String phoneNumber = mutation.phoneNumber().trim();
String address = formatAddress(street, houseNumber, postalCode, city);
String displayName = companyName;
String portalLogin = generateUniquePortalLogin(localPart(normalizedEmail));
String code = generateUniqueCode("K" + companyName);
@@ -495,7 +527,12 @@ public class CatalogService {
displayName,
companyName,
address,
street,
houseNumber,
postalCode,
city,
normalizedEmail,
phoneNumber,
portalLogin,
passwordEncoder.encode(mutation.password()),
true,
@@ -518,10 +555,11 @@ public class CatalogService {
}
public void ensureDefaultUsers() {
migrateLegacyAppUsers();
ensureDefaultUser("ADM", "Administrator", "admin@muh.local", "admin", "Admin123!", UserRole.ADMIN);
ensureDefaultUser("SV", "Sven", "sven@muh.local", "sven", "muh123", UserRole.APP);
ensureDefaultUser("AK", "Anna", "anna@muh.local", "anna", "muh123", UserRole.APP);
ensureDefaultUser("LH", "Lena", "lena@muh.local", "lena", "muh123", UserRole.APP);
ensureDefaultUser("SV", "Sven", "sven@muh.local", "sven", "muh123", UserRole.CUSTOMER);
ensureDefaultUser("AK", "Anna", "anna@muh.local", "anna", "muh123", UserRole.CUSTOMER);
ensureDefaultUser("LH", "Lena", "lena@muh.local", "lena", "muh123", UserRole.CUSTOMER);
}
public Farmer requireActiveFarmer(String businessKey) {
@@ -597,11 +635,12 @@ public class CatalogService {
user.code(),
user.displayName(),
user.companyName(),
user.address(),
resolveAddress(user),
user.email(),
user.phoneNumber(),
user.portalLogin(),
user.active(),
user.role(),
normalizeStoredRole(user.role()),
user.updatedAt()
);
}
@@ -628,10 +667,11 @@ public class CatalogService {
user.code(),
user.displayName(),
user.companyName(),
user.address(),
resolveAddress(user),
user.email(),
user.phoneNumber(),
user.portalLogin(),
user.role()
normalizeStoredRole(user.role())
);
}
@@ -690,6 +730,46 @@ public class CatalogService {
.or(() -> appUserRepository.findByPortalLoginIgnoreCase(identifier));
}
private void requireAdminActor(String actorId) {
if (isBlank(actorId)) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Nur Administratoren koennen Benutzer anlegen");
}
String actorIdValue = requireText(actorId, "Nur Administratoren koennen Benutzer anlegen");
AppUser actor = appUserRepository.findById(actorIdValue)
.filter(AppUser::active)
.orElseThrow(() -> new ResponseStatusException(HttpStatus.FORBIDDEN, "Nur Administratoren koennen Benutzer anlegen"));
if (actor.role() != UserRole.ADMIN) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "Nur Administratoren koennen Benutzer anlegen");
}
}
private void migrateLegacyAppUsers() {
LocalDateTime now = LocalDateTime.now();
appUserRepository.findAll().stream()
.filter(user -> user.role() == UserRole.APP)
.forEach(user -> appUserRepository.save(new AppUser(
user.id(),
user.code(),
user.displayName(),
user.companyName(),
user.address(),
user.street(),
user.houseNumber(),
user.postalCode(),
user.city(),
user.email(),
user.phoneNumber(),
user.portalLogin(),
user.passwordHash(),
user.active(),
UserRole.CUSTOMER,
user.createdAt(),
now
)));
}
private void ensureDefaultUser(
String code,
String displayName,
@@ -712,7 +792,12 @@ public class CatalogService {
displayName,
null,
null,
null,
null,
null,
null,
email,
null,
portalLogin,
passwordEncoder.encode(rawPassword),
true,
@@ -726,6 +811,37 @@ public class CatalogService {
return isBlank(email) ? null : email.trim().toLowerCase(Locale.ROOT);
}
private UserRole normalizeStoredRole(UserRole role) {
return role == null || role == UserRole.APP ? UserRole.CUSTOMER : role;
}
private UserRole normalizeManagedRole(UserRole role) {
return role == null || role == UserRole.APP ? UserRole.CUSTOMER : role;
}
private String resolveAddress(AppUser user) {
if (!isBlank(user.address())) {
return user.address();
}
if (isBlank(user.street()) && isBlank(user.houseNumber()) && isBlank(user.postalCode()) && isBlank(user.city())) {
return null;
}
return formatAddress(user.street(), user.houseNumber(), user.postalCode(), user.city());
}
private String formatAddress(String street, String houseNumber, String postalCode, String city) {
String streetPart = joinParts(" ", street, houseNumber);
String cityPart = joinParts(" ", postalCode, city);
return joinParts(", ", streetPart, cityPart);
}
private String joinParts(String separator, String... parts) {
return Arrays.stream(parts)
.filter(part -> !isBlank(part))
.map(String::trim)
.collect(Collectors.joining(separator));
}
private String localPart(String email) {
int separator = email.indexOf('@');
return separator >= 0 ? email.substring(0, separator) : email;
@@ -810,6 +926,7 @@ public class CatalogService {
String companyName,
String address,
String email,
String phoneNumber,
String portalLogin,
UserRole role
) {
@@ -875,6 +992,7 @@ public class CatalogService {
String companyName,
String address,
String email,
String phoneNumber,
String portalLogin,
boolean active,
UserRole role,
@@ -898,8 +1016,12 @@ public class CatalogService {
public record RegistrationMutation(
String companyName,
String address,
String street,
String houseNumber,
String postalCode,
String city,
String email,
String phoneNumber,
String password
) {
}

95
backend/src/main/java/de/svencarstensen/muh/service/ReportService.java
View File

@@ -1,42 +1,56 @@
package de.svencarstensen.muh.service;
import de.svencarstensen.muh.domain.Sample;
import de.svencarstensen.muh.domain.AppUser;
import de.svencarstensen.muh.repository.AppUserRepository;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpStatus;
import org.springframework.lang.NonNull;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.server.ResponseStatusException;
import jakarta.mail.internet.MimeMessage;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Service
public class ReportService {
private final SampleService sampleService;
private final AppUserRepository appUserRepository;
private final ObjectProvider<JavaMailSender> mailSenderProvider;
private final boolean mailEnabled;
private final String mailFrom;
private final String reportMailTemplate;
public ReportService(
SampleService sampleService,
AppUserRepository appUserRepository,
ObjectProvider<JavaMailSender> mailSenderProvider,
@Value("classpath:mail/report-mail-template.txt") Resource reportMailTemplateResource,
@Value("${muh.mail.enabled:false}") boolean mailEnabled,
@Value("${muh.mail.from:no-reply@muh.local}") String mailFrom
) {
this.sampleService = sampleService;
this.appUserRepository = appUserRepository;
this.mailSenderProvider = mailSenderProvider;
this.mailEnabled = mailEnabled;
this.mailFrom = mailFrom;
this.reportMailTemplate = loadTemplate(reportMailTemplateResource);
}
public List<ReportCandidate> reportCandidates() {
@@ -46,7 +60,8 @@ public class ReportService {
.toList();
}
public DispatchResult sendReports(List<String> sampleIds) {
public DispatchResult sendReports(String actorId, List<String> sampleIds) {
String customerSignature = buildCustomerSignature(actorId);
List<ReportCandidate> sent = new ArrayList<>();
List<ReportCandidate> skipped = new ArrayList<>();
@@ -59,7 +74,7 @@ public class ReportService {
byte[] pdf = buildPdf(sample);
if (mailEnabled && mailSenderProvider.getIfAvailable() != null) {
sendMail(sample, pdf);
sendMail(sample, pdf, customerSignature);
}
Sample updated = sampleService.markReportSent(sample.id(), LocalDateTime.now());
sent.add(toCandidate(updated));
@@ -75,7 +90,7 @@ public class ReportService {
return sampleService.getSample(sampleService.toggleReportBlocked(sampleId, blocked).id());
}
private void sendMail(Sample sample, byte[] pdf) {
private void sendMail(Sample sample, byte[] pdf, String customerSignature) {
try {
JavaMailSender sender = mailSenderProvider.getIfAvailable();
if (sender == null) {
@@ -86,7 +101,7 @@ public class ReportService {
helper.setFrom(requireText(mailFrom, "Absender fehlt"));
helper.setTo(requireText(sample.farmerEmail(), "Empfänger fehlt"));
helper.setSubject("MUH-Bericht Probe " + sample.sampleNumber());
helper.setText("Im Anhang befindet sich der Bericht zur Probe " + sample.sampleNumber() + ".", false);
helper.setText(buildMailBody(sample, customerSignature), false);
helper.addAttachment("MUH-Bericht-" + sample.sampleNumber() + ".pdf", new ByteArrayResource(Objects.requireNonNull(pdf)));
sender.send(message);
} catch (Exception exception) {
@@ -136,6 +151,78 @@ public class ReportService {
return value == null || value.isBlank() ? "-" : value;
}
private String buildMailBody(Sample sample, String customerSignature) {
return reportMailTemplate
.replace("{{sampleNumber}}", String.valueOf(sample.sampleNumber()))
.replace("{{cowLabel}}", resolveCowLabel(sample))
.replace("{{customerSignature}}", customerSignature);
}
private String resolveCowLabel(Sample sample) {
if (sample.cowName() == null || sample.cowName().isBlank()) {
return sample.cowNumber();
}
return sample.cowNumber() + " / " + sample.cowName();
}
private String buildCustomerSignature(String actorId) {
if (actorId == null || actorId.isBlank()) {
return defaultCustomerSignature();
}
AppUser actor = appUserRepository.findById(actorId.trim()).orElse(null);
if (actor == null) {
return defaultCustomerSignature();
}
String primaryName = firstNonBlank(actor.companyName(), actor.displayName(), actor.code(), "MUH App");
String secondaryName = actor.companyName() != null
&& actor.displayName() != null
&& !actor.companyName().equalsIgnoreCase(actor.displayName())
? actor.displayName()
: null;
String streetLine = joinParts(" ", actor.street(), actor.houseNumber());
String cityLine = joinParts(" ", actor.postalCode(), actor.city());
return Stream.of(
primaryName,
secondaryName,
streetLine,
cityLine,
actor.email(),
actor.phoneNumber()
)
.filter(part -> part != null && !part.isBlank())
.collect(Collectors.joining(System.lineSeparator()));
}
private String defaultCustomerSignature() {
return firstNonBlank(mailFrom, "MUH App");
}
private String joinParts(String separator, String... values) {
return Stream.of(values)
.filter(value -> value != null && !value.isBlank())
.map(String::trim)
.collect(Collectors.joining(separator));
}
private String firstNonBlank(String... values) {
return Stream.of(values)
.filter(value -> value != null && !value.isBlank())
.map(String::trim)
.findFirst()
.orElse("");
}
private String loadTemplate(Resource resource) {
try (InputStreamReader reader = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8)) {
return FileCopyUtils.copyToString(reader);
} catch (IOException exception) {
throw new IllegalStateException("Mail-Template konnte nicht geladen werden", exception);
}
}
private @NonNull String requireText(String value, String message) {
if (value == null || value.isBlank()) {
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, message);

8
backend/src/main/java/de/svencarstensen/muh/web/CatalogController.java
View File

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -57,8 +58,11 @@ public class CatalogController {
}
@PostMapping("/portal/users")
public CatalogService.UserRow saveUser(@RequestBody CatalogService.UserMutation mutation) {
return catalogService.createOrUpdateUser(mutation);
public CatalogService.UserRow saveUser(
@RequestHeader(value = "X-MUH-Actor-Id", required = false) String actorId,
@RequestBody CatalogService.UserMutation mutation
) {
return catalogService.createOrUpdateUser(actorId, mutation);
}
@DeleteMapping("/portal/users/{id}")

8
backend/src/main/java/de/svencarstensen/muh/web/PortalController.java
View File

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@@ -49,8 +50,11 @@ public class PortalController {
}
@PostMapping("/reports/send")
public ReportService.DispatchResult send(@RequestBody ReportDispatchRequest request) {
return reportService.sendReports(request.sampleIds());
public ReportService.DispatchResult send(
@RequestHeader(value = "X-MUH-Actor-Id", required = false) String actorId,
@RequestBody ReportDispatchRequest request
) {
return reportService.sendReports(actorId, request.sampleIds());
}
@PatchMapping("/reports/{sampleId}/block")

12
backend/src/main/java/de/svencarstensen/muh/web/SessionController.java
View File

@@ -39,8 +39,12 @@ public class SessionController {
public CatalogService.UserOption register(@RequestBody RegistrationRequest request) {
return catalogService.registerCustomer(new CatalogService.RegistrationMutation(
request.companyName(),
request.address(),
request.street(),
request.houseNumber(),
request.postalCode(),
request.city(),
request.email(),
request.phoneNumber(),
request.password()
));
}
@@ -53,8 +57,12 @@ public class SessionController {
public record RegistrationRequest(
@NotBlank String companyName,
@NotBlank String address,
@NotBlank String street,
@NotBlank String houseNumber,
@NotBlank String postalCode,
@NotBlank String city,
@NotBlank String email,
@NotBlank String phoneNumber,
@NotBlank String password
) {
}

18
backend/src/main/java/de/svencarstensen/muh/web/SpaForwardController.java Normal file
View File

@@ -0,0 +1,18 @@
package de.svencarstensen.muh.web;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@Controller
public class SpaForwardController {
@GetMapping({
"/",
"/{path:^(?!api$)[^.]+}",
"/{path:^(?!api$)[^.]+}/{segment:[^.]+}",
"/{path:^(?!api$)[^.]+}/{segment:[^.]+}/{leaf:[^.]+}"
})
public String forward() {
return "forward:/index.html";
}
}

15
backend/src/main/resources/application.yml
View File

@@ -1,12 +1,18 @@
server:
port: 8090
error:
include-message: always
spring:
config:
import:
- optional:file:./.env[.properties]
- optional:file:../.env[.properties]
application:
name: muh-backend
data:
mongodb:
uri: mongodb://192.168.180.25:27017/muh
uri: ${MUH_MONGODB_URL:mongodb://192.168.180.25:27017/muh}
jackson:
time-zone: Europe/Berlin
mail:
@@ -14,8 +20,11 @@ spring:
port: ${MUH_MAIL_PORT:587}
username: ${MUH_MAIL_USERNAME:}
password: ${MUH_MAIL_PASSWORD:}
protocol: ${MUH_MAIL_PROTOCOL:smtp}
properties:
mail:
transport:
protocol: ${MUH_MAIL_PROTOCOL:smtp}
smtp:
auth: ${MUH_MAIL_AUTH:false}
starttls:
@@ -24,6 +33,10 @@ spring:
muh:
cors:
allowed-origins: ${MUH_ALLOWED_ORIGINS:http://localhost:5173,http://localhost:3000}
mongodb:
url: ${MUH_MONGODB_URL:mongodb://192.168.180.25:27017/muh}
username: ${MUH_MONGODB_USERNAME:}
password: ${MUH_MONGODB_PASSWORD:}
mail:
enabled: ${MUH_MAIL_ENABLED:false}
from: ${MUH_MAIL_FROM:no-reply@muh.local}

39
backend/src/main/resources/mail/report-mail-template.txt Normal file
View File

@@ -0,0 +1,39 @@
Anbei finden Sie die Milchprobenauswertung Nr. {{sampleNumber}} fuer Ihre Kuh {{cowLabel}}.
Dies ist eine automatisch generierte E-Mail von einer System-E-Mail-Adresse, bitte nicht antworten.
Mit freundlichen Gruessen
{{customerSignature}}
Liste der Handelsnamen und Wirkstoffe
Laktation
Penicillin: Mastinject, Revozyn RTU, Penicillin Injektoren, Ingel Mamyzin
Amoxicillin Clavulansaeure: Synulox RTU/LC, Noroclav
Sulfadoxin Trimetoprim: Diatrim, Sulphix
Lincomycin Neomycin: Albiotic
Tylosin: Pharmasin
Cefquinom: Cobactan
Cefoperacon: Peracef
Enrofloxacin: Powerflox
Cefalexin/Kanamycin: Ubrolexin
Ampicillin/Cloxacillin: Gelstamp
Trockensteher
Framycetin: Benestermycin
Cefalonium: Cepravin
Penicillin: Mastinject, Revozyn RTU, Penicillin Injektoren, Naphpenzal T
Cloxacillin: Orbenin und Cloxacillin
Amoxicillin Clavulansaeure: Synulox RTU/LC
Sulfadoxin Trimetoprim: Diatrim
Lincomycin Neomycin: Albiotic
Tylosin: Pharmasin
Cefquinom: Cobactan
Cefoperacon: Peracef
Enrofloxacin: Powerflox

23
frontend/src/layout/AppShell.tsx
View File

@@ -1,13 +1,6 @@
import { NavLink, Outlet, useLocation, useNavigate } from "react-router-dom";
import { useSession } from "../lib/session";
const NAV_ITEMS = [
{ to: "/home", label: "Start" },
{ to: "/samples/new", label: "Neue Probe" },
{ to: "/admin", label: "Verwaltung" },
{ to: "/portal", label: "Portal" },
];
const PAGE_TITLES: Record<string, string> = {
"/home": "Startseite",
"/samples/new": "Neuanlage einer Probe",
@@ -35,6 +28,14 @@ export default function AppShell() {
const { user, setUser } = useSession();
const location = useLocation();
const navigate = useNavigate();
const navItems = user?.role === "ADMIN"
? [{ to: "/portal", label: "Benutzerverwaltung" }]
: [
{ to: "/home", label: "Start" },
{ to: "/samples/new", label: "Neue Probe" },
{ to: "/admin", label: "Verwaltung" },
{ to: "/portal", label: "Portal" },
];
return (
<div className="app-shell">
@@ -44,7 +45,7 @@ export default function AppShell() {
</div>
<nav className="sidebar__nav">
{NAV_ITEMS.map((item) => (
{navItems.map((item) => (
<NavLink
key={item.to}
to={item.to}
@@ -78,12 +79,6 @@ export default function AppShell() {
<div className="topbar__headline">
<h2>{resolvePageTitle(location.pathname)}</h2>
</div>
<div className="topbar__actions">
<button type="button" className="accent-button" onClick={() => navigate("/samples/new")}>
Neuanlage
</button>
</div>
</header>
<main className="content-area">

75
frontend/src/lib/api.ts
View File

@@ -1,9 +1,56 @@
const API_ROOT = import.meta.env.VITE_API_URL ?? "http://localhost:8090/api";
import { USER_STORAGE_KEY } from "./storage";
const API_ROOT = import.meta.env.VITE_API_URL ?? (import.meta.env.DEV ? "http://localhost:8090/api" : "/api");
type ApiErrorPayload = {
message?: string;
error?: string;
detail?: string;
};
async function readErrorMessage(response: Response): Promise<string> {
const contentType = response.headers.get("content-type") ?? "";
if (contentType.includes("application/json")) {
const payload = (await response.json()) as ApiErrorPayload;
const message = payload.message?.trim() || payload.detail?.trim();
if (message) {
return message;
}
if (payload.error?.trim()) {
return `Anfrage fehlgeschlagen: ${payload.error.trim()}`;
}
}
const text = (await response.text()).trim();
if (text) {
return text;
}
return `Anfrage fehlgeschlagen (${response.status})`;
}
function actorHeaders(): Record<string, string> {
if (typeof window === "undefined") {
return {};
}
const rawUser = window.localStorage.getItem(USER_STORAGE_KEY);
if (!rawUser) {
return {};
}
try {
const user = JSON.parse(rawUser) as { id?: string | null };
return user.id ? { "X-MUH-Actor-Id": user.id } : {};
} catch {
return {};
}
}
async function handleResponse<T>(response: Response): Promise<T> {
if (!response.ok) {
const text = await response.text();
throw new Error(text || "Unbekannter API-Fehler");
throw new Error(await readErrorMessage(response));
}
if (response.status === 204) {
return undefined as T;
@@ -12,14 +59,21 @@ async function handleResponse<T>(response: Response): Promise<T> {
}
export async function apiGet<T>(path: string): Promise<T> {
return handleResponse<T>(await fetch(`${API_ROOT}${path}`));
return handleResponse<T>(
await fetch(`${API_ROOT}${path}`, {
headers: actorHeaders(),
}),
);
}
export async function apiPost<T>(path: string, body: unknown): Promise<T> {
return handleResponse<T>(
await fetch(`${API_ROOT}${path}`, {
method: "POST",
headers: { "Content-Type": "application/json" },
headers: {
"Content-Type": "application/json",
...actorHeaders(),
},
body: JSON.stringify(body),
}),
);
@@ -29,7 +83,10 @@ export async function apiPut<T>(path: string, body: unknown): Promise<T> {
return handleResponse<T>(
await fetch(`${API_ROOT}${path}`, {
method: "PUT",
headers: { "Content-Type": "application/json" },
headers: {
"Content-Type": "application/json",
...actorHeaders(),
},
body: JSON.stringify(body),
}),
);
@@ -39,7 +96,10 @@ export async function apiPatch<T>(path: string, body: unknown): Promise<T> {
return handleResponse<T>(
await fetch(`${API_ROOT}${path}`, {
method: "PATCH",
headers: { "Content-Type": "application/json" },
headers: {
"Content-Type": "application/json",
...actorHeaders(),
},
body: JSON.stringify(body),
}),
);
@@ -49,6 +109,7 @@ export async function apiDelete(path: string): Promise<void> {
await handleResponse<void>(
await fetch(`${API_ROOT}${path}`, {
method: "DELETE",
headers: actorHeaders(),
}),
);
}

3
frontend/src/lib/types.ts
View File

@@ -16,7 +16,7 @@ export type MedicationCategory =
| "SYSTEMIC_PAIN"
| "DRY_SEALER"
| "DRY_ANTIBIOTIC";
export type UserRole = "APP" | "ADMIN" | "CUSTOMER";
export type UserRole = "ADMIN" | "CUSTOMER";
export interface FarmerOption {
businessKey: string;
@@ -50,6 +50,7 @@ export interface UserOption {
companyName: string | null;
address: string | null;
email: string | null;
phoneNumber: string | null;
portalLogin: string | null;
role: UserRole;
}

7
frontend/src/pages/HomePage.tsx
View File

@@ -83,10 +83,7 @@ export default function HomePage() {
/>
</label>
<button type="submit" className="accent-button">
Probe oeffnen
</button>
<button type="button" className="secondary-button" onClick={() => navigate("/samples/new")}>
Neuanlage einer Probe
Probe öffnen
</button>
</form>
@@ -162,7 +159,7 @@ export default function HomePage() {
)
}
>
Oeffnen
Öffnen
</button>
</td>
</tr>

351
frontend/src/pages/LoginPage.tsx
View File

@@ -1,5 +1,5 @@
import { FormEvent, useEffect, useState } from "react";
import { apiGet, apiPost } from "../lib/api";
import { FormEvent, useState } from "react";
import { apiPost } from "../lib/api";
import { useSession } from "../lib/session";
import type { UserOption } from "../lib/types";
@@ -9,56 +9,36 @@ type FeedbackState =
| null;
export default function LoginPage() {
const [users, setUsers] = useState<UserOption[]>([]);
const [manualCode, setManualCode] = useState("");
const [showRegistration, setShowRegistration] = useState(false);
const [identifier, setIdentifier] = useState("");
const [password, setPassword] = useState("");
const [registration, setRegistration] = useState({
companyName: "",
address: "",
street: "",
houseNumber: "",
postalCode: "",
city: "",
email: "",
phoneNumber: "",
password: "",
passwordConfirmation: "",
});
const [loading, setLoading] = useState(true);
const [feedback, setFeedback] = useState<FeedbackState>(null);
const { setUser } = useSession();
async function loadUsers() {
setLoading(true);
setFeedback(null);
try {
const response = await apiGet<UserOption[]>("/session/users");
setUsers(response);
} catch (loadError) {
setFeedback({ type: "error", text: (loadError as Error).message });
setUsers([]);
} finally {
setLoading(false);
}
}
useEffect(() => {
void loadUsers();
}, []);
async function handleCodeLogin(code: string) {
if (!code.trim()) {
setFeedback({ type: "error", text: "Bitte ein Benutzerkuerzel eingeben oder auswaehlen." });
async function handlePasswordLogin(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
if (!identifier.trim() || !password.trim()) {
setFeedback({
type: "error",
text: "Bitte E-Mail oder Benutzername und Passwort eingeben.",
});
return;
}
try {
const response = await apiPost<UserOption>("/session/login", { code });
setUser(response);
} catch (loginError) {
setFeedback({ type: "error", text: (loginError as Error).message });
}
}
async function handlePasswordLogin(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
try {
setFeedback(null);
const response = await apiPost<UserOption>("/session/password-login", {
identifier,
identifier: identifier.trim(),
password,
});
setUser(response);
@@ -69,8 +49,31 @@ export default function LoginPage() {
async function handleRegister(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
if (
!registration.companyName.trim()
|| !registration.street.trim()
|| !registration.houseNumber.trim()
|| !registration.postalCode.trim()
|| !registration.city.trim()
|| !registration.email.trim()
|| !registration.phoneNumber.trim()
|| !registration.password.trim()
) {
setFeedback({
type: "error",
text: "Bitte alle Pflichtfelder inklusive Telefonnummer fuer die Registrierung ausfuellen.",
});
return;
}
if (registration.password !== registration.passwordConfirmation) {
setFeedback({ type: "error", text: "Die beiden Passwoerter stimmen nicht ueberein." });
return;
}
try {
const response = await apiPost<UserOption>("/session/register", registration);
setFeedback(null);
const { passwordConfirmation, ...registrationPayload } = registration;
void passwordConfirmation;
const response = await apiPost<UserOption>("/session/register", registrationPayload);
setFeedback({
type: "success",
text: `Registrierung erfolgreich. Willkommen ${response.companyName ?? response.displayName}.`,
@@ -98,8 +101,8 @@ export default function LoginPage() {
<p className="eyebrow">Zugang</p>
<h2>Anmelden oder registrieren</h2>
<p className="muted-text">
Weiterhin moeglich: Direktanmeldung per Benutzerkuerzel. Neu: Login mit
E-Mail/Benutzername und Passwort.
Anmeldung per E-Mail oder Benutzername mit Passwort sowie direkte
Kundenregistrierung.
</p>
{feedback ? (
@@ -108,146 +111,156 @@ export default function LoginPage() {
</div>
) : null}
<div className="login-panel__section">
<div className="section-card__header">
<div>
<p className="eyebrow">Schnelllogin</p>
<h3>Benutzerkuerzel</h3>
</div>
<button type="button" className="secondary-button" onClick={() => void loadUsers()}>
Neu laden
</button>
</div>
{loading ? (
<div className="empty-state">Benutzer werden geladen ...</div>
) : users.length ? (
<div className="user-grid">
{users.map((user) => (
<button
key={user.id}
type="button"
className="user-card"
onClick={() => void handleCodeLogin(user.code)}
>
<span className="user-card__code">{user.code}</span>
<strong>{user.displayName}</strong>
<small>
{user.role === "ADMIN"
? "Admin"
: user.role === "CUSTOMER"
? "Kunde"
: "App"}
</small>
</button>
))}
</div>
) : (
<div className="page-stack">
<div className="empty-state">
Es wurden keine aktiven Benutzer geladen. Das Kuersel kann trotzdem direkt
eingegeben werden.
</div>
<div className="auth-grid">
{!showRegistration ? (
<form className="login-panel__section" onSubmit={handlePasswordLogin}>
<label className="field">
<span>Benutzerkuerzel</span>
<span>E-Mail / Benutzername</span>
<input
value={manualCode}
onChange={(event) => setManualCode(event.target.value.toUpperCase())}
placeholder="z. B. SV"
value={identifier}
onChange={(event) => setIdentifier(event.target.value)}
placeholder="z. B. admin oder name@hof.de"
/>
</label>
<label className="field">
<span>Passwort</span>
<input
type="password"
value={password}
onChange={(event) => setPassword(event.target.value)}
/>
</label>
<div className="page-actions">
<button type="submit" className="accent-button">
Mit Passwort anmelden
</button>
<button
type="button"
className="accent-button"
onClick={() => void handleCodeLogin(manualCode)}
className="secondary-button"
onClick={() => {
setFeedback(null);
setShowRegistration(true);
}}
>
Mit Kuerzel anmelden
Registrieren
</button>
</div>
</div>
</form>
) : (
<form className="login-panel__section" onSubmit={handleRegister}>
<div className="field-grid">
<label className="field field--wide">
<span>Firmenname</span>
<input
value={registration.companyName}
onChange={(event) =>
setRegistration((current) => ({ ...current, companyName: event.target.value }))
}
placeholder="z. B. Muster Agrar GmbH"
/>
</label>
<label className="field">
<span>Strasse</span>
<input
value={registration.street}
onChange={(event) =>
setRegistration((current) => ({ ...current, street: event.target.value }))
}
placeholder="z. B. Dorfstrasse"
/>
</label>
<label className="field">
<span>Hausnummer</span>
<input
value={registration.houseNumber}
onChange={(event) =>
setRegistration((current) => ({ ...current, houseNumber: event.target.value }))
}
placeholder="z. B. 12a"
/>
</label>
<label className="field">
<span>PLZ</span>
<input
value={registration.postalCode}
onChange={(event) =>
setRegistration((current) => ({ ...current, postalCode: event.target.value }))
}
placeholder="z. B. 12345"
/>
</label>
<label className="field">
<span>Ort</span>
<input
value={registration.city}
onChange={(event) =>
setRegistration((current) => ({ ...current, city: event.target.value }))
}
placeholder="z. B. Musterstadt"
/>
</label>
<label className="field">
<span>E-Mail</span>
<input
type="email"
value={registration.email}
onChange={(event) =>
setRegistration((current) => ({ ...current, email: event.target.value }))
}
/>
</label>
<label className="field">
<span>Telefonnummer</span>
<input
value={registration.phoneNumber}
onChange={(event) =>
setRegistration((current) => ({ ...current, phoneNumber: event.target.value }))
}
placeholder="z. B. 04531 181424"
/>
</label>
<label className="field field--wide">
<span>Passwort</span>
<input
type="password"
value={registration.password}
onChange={(event) =>
setRegistration((current) => ({ ...current, password: event.target.value }))
}
/>
</label>
<label className="field field--wide">
<span>Passwort wiederholen</span>
<input
type="password"
value={registration.passwordConfirmation}
onChange={(event) =>
setRegistration((current) => ({
...current,
passwordConfirmation: event.target.value,
}))
}
/>
</label>
</div>
<div className="page-actions">
<button type="submit" className="accent-button">
Registrieren
</button>
<button
type="button"
className="secondary-button"
onClick={() => {
setFeedback(null);
setShowRegistration(false);
}}
>
Zurück
</button>
</div>
</form>
)}
</div>
<div className="divider-label">oder mit Passwort</div>
<div className="auth-grid">
<form className="login-panel__section" onSubmit={handlePasswordLogin}>
<p className="eyebrow">Login</p>
<h3>E-Mail oder Benutzername</h3>
<label className="field">
<span>E-Mail / Benutzername</span>
<input
value={identifier}
onChange={(event) => setIdentifier(event.target.value)}
placeholder="z. B. admin oder name@hof.de"
/>
</label>
<label className="field">
<span>Passwort</span>
<input
type="password"
value={password}
onChange={(event) => setPassword(event.target.value)}
/>
</label>
<div className="page-actions">
<button type="submit" className="accent-button">
Mit Passwort anmelden
</button>
</div>
</form>
<form className="login-panel__section" onSubmit={handleRegister}>
<p className="eyebrow">Kundenregistrierung</p>
<h3>Neues Kundenkonto anlegen</h3>
<label className="field">
<span>Firmenname</span>
<input
value={registration.companyName}
onChange={(event) =>
setRegistration((current) => ({ ...current, companyName: event.target.value }))
}
placeholder="z. B. Muster Agrar GmbH"
/>
</label>
<label className="field">
<span>Adresse</span>
<textarea
value={registration.address}
onChange={(event) =>
setRegistration((current) => ({ ...current, address: event.target.value }))
}
placeholder="Strasse, Hausnummer, PLZ Ort"
/>
</label>
<label className="field">
<span>E-Mail</span>
<input
type="email"
value={registration.email}
onChange={(event) =>
setRegistration((current) => ({ ...current, email: event.target.value }))
}
/>
</label>
<label className="field">
<span>Passwort</span>
<input
type="password"
value={registration.password}
onChange={(event) =>
setRegistration((current) => ({ ...current, password: event.target.value }))
}
/>
</label>
<div className="page-actions">
<button type="submit" className="accent-button">
Registrieren
</button>
</div>
</form>
</div>
</div>
</section>
</div>

306
frontend/src/pages/PortalPage.tsx
View File

@@ -1,5 +1,6 @@
import { FormEvent, useEffect, useMemo, useState } from "react";
import { apiDelete, apiGet, apiPatch, apiPost, pdfUrl } from "../lib/api";
import { useSession } from "../lib/session";
import type { PortalSnapshot, UserRole } from "../lib/types";
function formatDate(value: string | null) {
@@ -13,12 +14,8 @@ function formatDate(value: string | null) {
}
export default function PortalPage() {
const { user } = useSession();
const [snapshot, setSnapshot] = useState<PortalSnapshot | null>(null);
const [selectedFarmer, setSelectedFarmer] = useState("");
const [farmerQuery, setFarmerQuery] = useState("");
const [cowQuery, setCowQuery] = useState("");
const [sampleNumberQuery, setSampleNumberQuery] = useState("");
const [dateQuery, setDateQuery] = useState("");
const [selectedReports, setSelectedReports] = useState<string[]>([]);
const [message, setMessage] = useState<string | null>(null);
const [userForm, setUserForm] = useState({
@@ -27,29 +24,13 @@ export default function PortalPage() {
email: "",
portalLogin: "",
password: "",
role: "APP" as UserRole,
role: "CUSTOMER" as UserRole,
});
const [passwordDrafts, setPasswordDrafts] = useState<Record<string, string>>({});
const isAdmin = user?.role === "ADMIN";
async function loadSnapshot() {
const params = new URLSearchParams();
if (selectedFarmer) {
params.set("farmerBusinessKey", selectedFarmer);
}
if (farmerQuery) {
params.set("farmerQuery", farmerQuery);
}
if (cowQuery) {
params.set("cowQuery", cowQuery);
}
if (sampleNumberQuery) {
params.set("sampleNumber", sampleNumberQuery);
}
if (dateQuery) {
params.set("date", dateQuery);
}
const response = await apiGet<PortalSnapshot>(`/portal/snapshot?${params.toString()}`);
const response = await apiGet<PortalSnapshot>("/portal/snapshot");
setSnapshot(response);
setSelectedReports(response.reportCandidates.map((candidate) => candidate.sampleId));
}
@@ -69,16 +50,6 @@ export default function PortalPage() {
);
}
async function handleSearch(event?: FormEvent) {
event?.preventDefault();
try {
setMessage(null);
await loadSnapshot();
} catch (loadError) {
setMessage((loadError as Error).message);
}
}
async function handleDispatchReports() {
try {
const response = await apiPost<{ mailDeliveryActive: boolean }>("/portal/reports/send", {
@@ -97,6 +68,10 @@ export default function PortalPage() {
async function handleCreateUser(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
if (!isAdmin) {
setMessage("Nur Administratoren koennen Benutzer anlegen.");
return;
}
try {
await apiPost("/portal/users", {
...userForm,
@@ -108,7 +83,7 @@ export default function PortalPage() {
email: "",
portalLogin: "",
password: "",
role: "APP",
role: "CUSTOMER",
});
setMessage("Benutzer gespeichert.");
await loadSnapshot();
@@ -203,163 +178,114 @@ export default function PortalPage() {
</div>
</article>
<article className="section-card">
<p className="eyebrow">Benutzerverwaltung</p>
<form className="field-grid" onSubmit={handleCreateUser}>
<label className="field">
<span>Kuerzel</span>
<input
value={userForm.code}
onChange={(event) => setUserForm((current) => ({ ...current, code: event.target.value }))}
/>
</label>
<label className="field">
<span>Name</span>
<input
value={userForm.displayName}
onChange={(event) =>
setUserForm((current) => ({ ...current, displayName: event.target.value }))
}
/>
</label>
<label className="field">
<span>Login</span>
<input
value={userForm.portalLogin}
onChange={(event) =>
setUserForm((current) => ({ ...current, portalLogin: event.target.value }))
}
/>
</label>
<label className="field">
<span>E-Mail</span>
<input
type="email"
value={userForm.email}
onChange={(event) => setUserForm((current) => ({ ...current, email: event.target.value }))}
/>
</label>
<label className="field">
<span>Passwort</span>
<input
value={userForm.password}
onChange={(event) => setUserForm((current) => ({ ...current, password: event.target.value }))}
type="password"
/>
</label>
<label className="field">
<span>Rolle</span>
<select
value={userForm.role}
onChange={(event) => setUserForm((current) => ({ ...current, role: event.target.value as UserRole }))}
>
<option value="APP">APP</option>
<option value="ADMIN">ADMIN</option>
</select>
</label>
<div className="page-actions">
<button type="submit" className="accent-button">
Benutzer anlegen
</button>
</div>
</form>
{isAdmin ? (
<article className="section-card">
<p className="eyebrow">Benutzerverwaltung</p>
<form className="field-grid" onSubmit={handleCreateUser}>
<label className="field">
<span>Kuerzel</span>
<input
value={userForm.code}
onChange={(event) => setUserForm((current) => ({ ...current, code: event.target.value }))}
/>
</label>
<label className="field">
<span>Name</span>
<input
value={userForm.displayName}
onChange={(event) =>
setUserForm((current) => ({ ...current, displayName: event.target.value }))
}
/>
</label>
<label className="field">
<span>Login</span>
<input
value={userForm.portalLogin}
onChange={(event) =>
setUserForm((current) => ({ ...current, portalLogin: event.target.value }))
}
/>
</label>
<label className="field">
<span>E-Mail</span>
<input
type="email"
value={userForm.email}
onChange={(event) => setUserForm((current) => ({ ...current, email: event.target.value }))}
/>
</label>
<label className="field">
<span>Passwort</span>
<input
value={userForm.password}
onChange={(event) => setUserForm((current) => ({ ...current, password: event.target.value }))}
type="password"
/>
</label>
<label className="field">
<span>Rolle</span>
<select
value={userForm.role}
onChange={(event) => setUserForm((current) => ({ ...current, role: event.target.value as UserRole }))}
>
<option value="CUSTOMER">CUSTOMER</option>
<option value="ADMIN">ADMIN</option>
</select>
</label>
<div className="page-actions">
<button type="submit" className="accent-button">
Benutzer anlegen
</button>
</div>
</form>
<div className="table-shell">
<table className="data-table">
<thead>
<tr>
<th>Kuerzel</th>
<th>Name</th>
<th>E-Mail</th>
<th>Login</th>
<th>Rolle</th>
<th>Passwort</th>
<th />
</tr>
</thead>
<tbody>
{snapshot.users.map((user) => (
<tr key={user.id}>
<td>{user.code}</td>
<td>{user.displayName}</td>
<td>{user.email ?? "-"}</td>
<td>{user.portalLogin ?? "-"}</td>
<td>{user.role}</td>
<td>
<input
type="password"
value={passwordDrafts[user.id] ?? ""}
onChange={(event) =>
setPasswordDrafts((current) => ({ ...current, [user.id]: event.target.value }))
}
placeholder="Neues Passwort"
/>
</td>
<td className="table-actions">
<button type="button" className="table-link" onClick={() => void handlePasswordChange(user.id)}>
Speichern
</button>
<button type="button" className="table-link table-link--danger" onClick={() => void handleDeleteUser(user.id)}>
Loeschen
</button>
</td>
<div className="table-shell">
<table className="data-table">
<thead>
<tr>
<th>Kuerzel</th>
<th>Name</th>
<th>E-Mail</th>
<th>Login</th>
<th>Rolle</th>
<th>Passwort</th>
<th />
</tr>
))}
</tbody>
</table>
</div>
</article>
</section>
<section className="section-card">
<form className="field-grid" onSubmit={handleSearch}>
<label className="field">
<span>Landwirt suchen</span>
<input value={farmerQuery} onChange={(event) => setFarmerQuery(event.target.value)} />
</label>
<label className="field">
<span>Gefundener Landwirt</span>
<select value={selectedFarmer} onChange={(event) => setSelectedFarmer(event.target.value)}>
<option value="">alle / noch keiner</option>
{snapshot.farmers.map((farmer) => (
<option key={farmer.businessKey} value={farmer.businessKey}>
{farmer.name}
</option>
))}
</select>
</label>
<label className="field">
<span>Kuh</span>
<input value={cowQuery} onChange={(event) => setCowQuery(event.target.value)} />
</label>
<label className="field">
<span>Probe-Nr.</span>
<input value={sampleNumberQuery} onChange={(event) => setSampleNumberQuery(event.target.value)} />
</label>
<label className="field">
<span>Datum</span>
<input type="date" value={dateQuery} onChange={(event) => setDateQuery(event.target.value)} />
</label>
<div className="page-actions page-actions--align-end">
<button type="submit" className="accent-button">
Suche starten
</button>
<button
type="button"
className="secondary-button"
onClick={() => {
setSelectedFarmer("");
setFarmerQuery("");
setCowQuery("");
setSampleNumberQuery("");
setDateQuery("");
void handleSearch();
}}
>
Zuruecksetzen
</button>
</div>
</form>
</thead>
<tbody>
{snapshot.users.map((user) => (
<tr key={user.id}>
<td>{user.code}</td>
<td>{user.displayName}</td>
<td>{user.email ?? "-"}</td>
<td>{user.portalLogin ?? "-"}</td>
<td>{user.role}</td>
<td>
<input
type="password"
value={passwordDrafts[user.id] ?? ""}
onChange={(event) =>
setPasswordDrafts((current) => ({ ...current, [user.id]: event.target.value }))
}
placeholder="Neues Passwort"
/>
</td>
<td className="table-actions">
<button type="button" className="table-link" onClick={() => void handlePasswordChange(user.id)}>
Speichern
</button>
<button type="button" className="table-link table-link--danger" onClick={() => void handleDeleteUser(user.id)}>
Loeschen
</button>
</td>
</tr>
))}
</tbody>
</table>
</div>
</article>
) : null}
</section>
<section className="section-card">

2
frontend/src/pages/SampleRegistrationPage.tsx
View File

@@ -138,7 +138,7 @@ export default function SampleRegistrationPage() {
{message ? <div className="alert alert--error">{message}</div> : null}
</section>
<section className="form-grid">
<section className="form-grid form-grid--stacked">
<article className="section-card">
<p className="eyebrow">Stammdaten</p>
<div className="field-grid">

35
frontend/src/styles/global.css
View File

@@ -57,16 +57,21 @@ a {
display: grid;
grid-template-columns: minmax(228px, 280px) minmax(0, 1fr);
min-height: 100vh;
align-items: start;
}
.sidebar {
position: sticky;
top: 0;
display: flex;
flex-direction: column;
justify-content: space-between;
padding: 28px 24px;
min-height: 100vh;
height: 100vh;
background: rgba(23, 34, 41, 0.92);
color: #f8f3ed;
backdrop-filter: blur(16px);
overflow: hidden;
}
.sidebar__brand {
@@ -89,8 +94,8 @@ a {
align-items: center;
justify-content: center;
width: 100%;
min-height: 108px;
padding: 16px 24px;
min-height: 54px;
padding: 8px 24px;
border-radius: 28px;
background: linear-gradient(135deg, #1d9485, #0f5b53);
font-weight: 700;
@@ -100,7 +105,9 @@ a {
.sidebar__nav {
display: grid;
gap: 10px;
margin: 32px 0 auto;
margin: 32px 0 0;
flex: 1 1 auto;
align-content: start;
}
.nav-link {
@@ -121,6 +128,8 @@ a {
.sidebar__footer {
display: grid;
gap: 12px;
margin-top: auto;
padding-top: 24px;
}
.user-chip {
@@ -263,6 +272,14 @@ a {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
.form-grid--stacked {
grid-template-columns: 1fr;
}
.portal-grid > :only-child {
grid-column: 1 / -1;
}
.metric-card {
padding: 22px 24px;
border-radius: var(--radius-lg);
@@ -307,6 +324,10 @@ a {
gap: 8px;
}
.field--wide {
grid-column: 1 / -1;
}
.field span {
font-size: 0.9rem;
color: var(--muted);
@@ -399,7 +420,7 @@ a {
}
.auth-grid {
grid-template-columns: repeat(2, minmax(0, 1fr));
grid-template-columns: 1fr;
margin-top: 18px;
}
@@ -582,10 +603,10 @@ a {
.login-hero {
display: grid;
grid-template-columns: 1.1fr 0.9fr;
grid-template-columns: 1fr;
gap: 28px;
align-items: stretch;
width: min(1240px, 100%);
width: min(960px, 100%);
}
.login-hero__copy {

1
frontend/src/vite-env.d.ts vendored
View File

@@ -1,4 +1,5 @@
interface ImportMetaEnv {
readonly DEV: boolean;
readonly VITE_API_URL?: string;
}