Compare commits
19 Commits
mai/ritchi
...
260f65ea02
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
260f65ea02 | ||
|
|
501b573967 | ||
|
|
23b8ef4bba | ||
|
|
54c6eb8dae | ||
|
|
967f2f6d09 | ||
|
|
e5387734aa | ||
|
|
6cb87c6868 | ||
|
|
d38719db2f | ||
|
|
b21efccfb5 | ||
|
|
f51d189a3b | ||
|
|
481b299e03 | ||
|
|
68d48100b9 | ||
|
|
40a11a4c49 | ||
|
|
eca0cde5e7 | ||
|
|
cf3711b2e4 | ||
|
|
dea49f6f8e | ||
|
|
5e401d2eac | ||
|
|
3f90904e0c | ||
|
|
f285d4451d |
6
.gitignore
vendored
6
.gitignore
vendored
@@ -46,3 +46,9 @@ tmp/
|
||||
# TypeScript
|
||||
*.tsbuildinfo
|
||||
.worktrees/
|
||||
backend/server
|
||||
backend/.m/
|
||||
.m/inbox_lastread
|
||||
backend/server
|
||||
backend/.m/
|
||||
.m/inbox_lastread
|
||||
|
||||
@@ -14,6 +14,13 @@ type Config struct {
|
||||
SupabaseJWTSecret string
|
||||
AnthropicAPIKey string
|
||||
FrontendOrigin string
|
||||
|
||||
// SMTP settings (optional — email sending disabled if SMTPHost is empty)
|
||||
SMTPHost string
|
||||
SMTPPort string
|
||||
SMTPUser string
|
||||
SMTPPass string
|
||||
MailFrom string
|
||||
}
|
||||
|
||||
func Load() (*Config, error) {
|
||||
@@ -26,6 +33,12 @@ func Load() (*Config, error) {
|
||||
SupabaseJWTSecret: os.Getenv("SUPABASE_JWT_SECRET"),
|
||||
AnthropicAPIKey: os.Getenv("ANTHROPIC_API_KEY"),
|
||||
FrontendOrigin: getEnv("FRONTEND_ORIGIN", "https://kanzlai.msbls.de"),
|
||||
|
||||
SMTPHost: os.Getenv("SMTP_HOST"),
|
||||
SMTPPort: getEnv("SMTP_PORT", "465"),
|
||||
SMTPUser: os.Getenv("SMTP_USER"),
|
||||
SMTPPass: os.Getenv("SMTP_PASS"),
|
||||
MailFrom: getEnv("MAIL_FROM", "mgmt@msbls.de"),
|
||||
}
|
||||
|
||||
if cfg.DatabaseURL == "" {
|
||||
|
||||
@@ -13,8 +13,8 @@ func Connect(databaseURL string) (*sqlx.DB, error) {
|
||||
return nil, fmt.Errorf("connecting to database: %w", err)
|
||||
}
|
||||
|
||||
// Set search_path so queries use kanzlai schema by default
|
||||
if _, err := db.Exec("SET search_path TO kanzlai, public"); err != nil {
|
||||
// Set search_path so queries use mgmt schema by default
|
||||
if _, err := db.Exec("SET search_path TO mgmt, public"); err != nil {
|
||||
db.Close()
|
||||
return nil, fmt.Errorf("setting search_path: %w", err)
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -39,6 +39,7 @@ type ProceedingType struct {
|
||||
Name string `db:"name" json:"name"`
|
||||
Description *string `db:"description" json:"description,omitempty"`
|
||||
Jurisdiction *string `db:"jurisdiction" json:"jurisdiction,omitempty"`
|
||||
Category *string `db:"category" json:"category,omitempty"`
|
||||
DefaultColor string `db:"default_color" json:"default_color"`
|
||||
SortOrder int `db:"sort_order" json:"sort_order"`
|
||||
IsActive bool `db:"is_active" json:"is_active"`
|
||||
|
||||
@@ -20,6 +20,7 @@ type UserTenant struct {
|
||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||
TenantID uuid.UUID `db:"tenant_id" json:"tenant_id"`
|
||||
Role string `db:"role" json:"role"`
|
||||
Email string `db:"email" json:"email"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,12 @@ package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"os/exec"
|
||||
"net"
|
||||
"net/smtp"
|
||||
"os"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
@@ -457,18 +460,85 @@ type UpdatePreferencesInput struct {
|
||||
DailyDigest bool `json:"daily_digest"`
|
||||
}
|
||||
|
||||
// SendEmail sends an email using the `m mail send` CLI command.
|
||||
// SendEmail sends an email via direct SMTP over TLS.
|
||||
// Requires SMTP_HOST, SMTP_USER, SMTP_PASS env vars. Falls back to no-op if unconfigured.
|
||||
func SendEmail(to, subject, body string) error {
|
||||
cmd := exec.Command("m", "mail", "send",
|
||||
"--to", to,
|
||||
"--subject", subject,
|
||||
"--body", body,
|
||||
"--yes")
|
||||
output, err := cmd.CombinedOutput()
|
||||
if err != nil {
|
||||
return fmt.Errorf("m mail send failed: %w (output: %s)", err, string(output))
|
||||
host := os.Getenv("SMTP_HOST")
|
||||
port := os.Getenv("SMTP_PORT")
|
||||
user := os.Getenv("SMTP_USER")
|
||||
pass := os.Getenv("SMTP_PASS")
|
||||
from := os.Getenv("MAIL_FROM")
|
||||
|
||||
if port == "" {
|
||||
port = "465"
|
||||
}
|
||||
slog.Info("email sent", "to", to, "subject", subject)
|
||||
if from == "" {
|
||||
from = "mgmt@msbls.de"
|
||||
}
|
||||
|
||||
if host == "" || user == "" || pass == "" {
|
||||
slog.Warn("SMTP not configured, skipping email", "to", to, "subject", subject)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Build RFC 2822 message
|
||||
msg := fmt.Sprintf("From: \"KanzlAI-mGMT\" <%s>\r\n"+
|
||||
"To: %s\r\n"+
|
||||
"Subject: [KanzlAI] %s\r\n"+
|
||||
"MIME-Version: 1.0\r\n"+
|
||||
"Content-Type: text/plain; charset=utf-8\r\n"+
|
||||
"Date: %s\r\n"+
|
||||
"\r\n%s",
|
||||
from, to, subject,
|
||||
time.Now().Format(time.RFC1123Z),
|
||||
body)
|
||||
|
||||
addr := net.JoinHostPort(host, port)
|
||||
|
||||
// Connect with implicit TLS (port 465)
|
||||
tlsConfig := &tls.Config{ServerName: host}
|
||||
conn, err := tls.Dial("tcp", addr, tlsConfig)
|
||||
if err != nil {
|
||||
return fmt.Errorf("smtp tls dial: %w", err)
|
||||
}
|
||||
|
||||
client, err := smtp.NewClient(conn, host)
|
||||
if err != nil {
|
||||
conn.Close()
|
||||
return fmt.Errorf("smtp new client: %w", err)
|
||||
}
|
||||
defer client.Close()
|
||||
|
||||
// Authenticate
|
||||
auth := smtp.PlainAuth("", user, pass, host)
|
||||
if err := client.Auth(auth); err != nil {
|
||||
return fmt.Errorf("smtp auth: %w", err)
|
||||
}
|
||||
|
||||
// Send
|
||||
if err := client.Mail(from); err != nil {
|
||||
return fmt.Errorf("smtp mail from: %w", err)
|
||||
}
|
||||
if err := client.Rcpt(to); err != nil {
|
||||
return fmt.Errorf("smtp rcpt to: %w", err)
|
||||
}
|
||||
|
||||
w, err := client.Data()
|
||||
if err != nil {
|
||||
return fmt.Errorf("smtp data: %w", err)
|
||||
}
|
||||
if _, err := w.Write([]byte(msg)); err != nil {
|
||||
return fmt.Errorf("smtp write: %w", err)
|
||||
}
|
||||
if err := w.Close(); err != nil {
|
||||
return fmt.Errorf("smtp close data: %w", err)
|
||||
}
|
||||
|
||||
if err := client.Quit(); err != nil {
|
||||
slog.Warn("smtp quit error (non-fatal)", "error", err)
|
||||
}
|
||||
|
||||
slog.Info("email sent via SMTP", "from", from, "to", to, "subject", subject)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -139,7 +139,11 @@ func (s *TenantService) FirstTenantForUser(ctx context.Context, userID uuid.UUID
|
||||
func (s *TenantService) ListMembers(ctx context.Context, tenantID uuid.UUID) ([]models.UserTenant, error) {
|
||||
var members []models.UserTenant
|
||||
err := s.db.SelectContext(ctx, &members,
|
||||
`SELECT user_id, tenant_id, role, created_at FROM user_tenants WHERE tenant_id = $1 ORDER BY created_at`,
|
||||
`SELECT ut.user_id, ut.tenant_id, ut.role, ut.created_at, COALESCE(au.email, '') as email
|
||||
FROM user_tenants ut
|
||||
LEFT JOIN auth.users au ON au.id = ut.user_id
|
||||
WHERE ut.tenant_id = $1
|
||||
ORDER BY ut.created_at`,
|
||||
tenantID,
|
||||
)
|
||||
if err != nil {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
-- Creates 1 test tenant, 5 cases with deadlines and appointments
|
||||
-- Run with: psql $DATABASE_URL -f demo_data.sql
|
||||
|
||||
SET search_path TO kanzlai, public;
|
||||
SET search_path TO mgmt, public;
|
||||
|
||||
-- Demo tenant
|
||||
INSERT INTO tenants (id, name, slug, settings) VALUES
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-- UPC Proceeding Timeline: Full event tree with conditional deadlines
|
||||
-- Ported from youpc.org migrations 039 + 040
|
||||
-- Run against kanzlai schema in flexsiebels Supabase instance
|
||||
-- Run against mgmt schema in youpc.org Supabase instance
|
||||
|
||||
-- ========================================
|
||||
-- 1. Add is_spawn + spawn_label columns
|
||||
|
||||
@@ -1,16 +1,14 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { api } from "@/lib/api";
|
||||
import type { ProceedingType } from "@/lib/types";
|
||||
|
||||
const TYPE_OPTIONS = [
|
||||
{ value: "", label: "-- Typ wählen --" },
|
||||
{ value: "INF", label: "Verletzungsklage (INF)" },
|
||||
{ value: "REV", label: "Widerruf (REV)" },
|
||||
{ value: "CCR", label: "Einstweilige Verfügung (CCR)" },
|
||||
{ value: "APP", label: "Berufung (APP)" },
|
||||
{ value: "PI", label: "Vorläufiger Rechtsschutz (PI)" },
|
||||
{ value: "ZPO_CIVIL", label: "ZPO Zivilverfahren" },
|
||||
];
|
||||
const JURISDICTION_LABELS: Record<string, string> = {
|
||||
UPC: "UPC-Verfahren",
|
||||
DE: "Deutsche Patentverfahren",
|
||||
};
|
||||
|
||||
export interface CaseFormData {
|
||||
case_number: string;
|
||||
@@ -34,6 +32,10 @@ export function CaseForm({
|
||||
isSubmitting,
|
||||
submitLabel = "Akte anlegen",
|
||||
}: CaseFormProps) {
|
||||
const { data: proceedingTypes } = useQuery({
|
||||
queryKey: ["proceeding-types"],
|
||||
queryFn: () => api.get<ProceedingType[]>("/proceeding-types"),
|
||||
});
|
||||
const [form, setForm] = useState<CaseFormData>({
|
||||
case_number: initialData?.case_number ?? "",
|
||||
title: initialData?.title ?? "",
|
||||
@@ -139,11 +141,24 @@ export function CaseForm({
|
||||
onChange={(e) => update("case_type", e.target.value)}
|
||||
className={inputClass}
|
||||
>
|
||||
{TYPE_OPTIONS.map((o) => (
|
||||
<option key={o.value} value={o.value}>
|
||||
{o.label}
|
||||
</option>
|
||||
))}
|
||||
<option value="">-- Typ wählen --</option>
|
||||
{(() => {
|
||||
const grouped = new Map<string, ProceedingType[]>();
|
||||
for (const pt of proceedingTypes ?? []) {
|
||||
const key = pt.jurisdiction ?? "Sonstige";
|
||||
if (!grouped.has(key)) grouped.set(key, []);
|
||||
grouped.get(key)!.push(pt);
|
||||
}
|
||||
return Array.from(grouped.entries()).map(([jurisdiction, types]) => (
|
||||
<optgroup key={jurisdiction} label={JURISDICTION_LABELS[jurisdiction] ?? jurisdiction}>
|
||||
{types.map((pt) => (
|
||||
<option key={pt.id} value={pt.code}>
|
||||
{pt.name} ({pt.code})
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
));
|
||||
})()}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
|
||||
@@ -35,7 +35,9 @@ const inputClass =
|
||||
|
||||
export function DeadlineCalculator() {
|
||||
const [proceedingType, setProceedingType] = useState("");
|
||||
const [triggerDate, setTriggerDate] = useState("");
|
||||
const [triggerDate, setTriggerDate] = useState(
|
||||
new Date().toISOString().split("T")[0],
|
||||
);
|
||||
|
||||
const { data: proceedingTypes, isLoading: typesLoading } = useQuery({
|
||||
queryKey: ["proceeding-types"],
|
||||
@@ -49,13 +51,28 @@ export function DeadlineCalculator() {
|
||||
}) => api.post<CalculateResponse>("/deadlines/calculate", params),
|
||||
});
|
||||
|
||||
// Auto-calculate when proceeding type changes (using current trigger date)
|
||||
function doCalculate(type: string, date: string) {
|
||||
if (!type || !date) return;
|
||||
calculateMutation.mutate({
|
||||
proceeding_type: type,
|
||||
trigger_event_date: date,
|
||||
});
|
||||
}
|
||||
|
||||
function handleProceedingChange(newType: string) {
|
||||
setProceedingType(newType);
|
||||
doCalculate(newType, triggerDate);
|
||||
}
|
||||
|
||||
function handleDateChange(newDate: string) {
|
||||
setTriggerDate(newDate);
|
||||
if (proceedingType) doCalculate(proceedingType, newDate);
|
||||
}
|
||||
|
||||
function handleCalculate(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
if (!proceedingType || !triggerDate) return;
|
||||
calculateMutation.mutate({
|
||||
proceeding_type: proceedingType,
|
||||
trigger_event_date: triggerDate,
|
||||
});
|
||||
doCalculate(proceedingType, triggerDate);
|
||||
}
|
||||
|
||||
const results = calculateMutation.data;
|
||||
@@ -78,16 +95,48 @@ export function DeadlineCalculator() {
|
||||
</label>
|
||||
<select
|
||||
value={proceedingType}
|
||||
onChange={(e) => setProceedingType(e.target.value)}
|
||||
onChange={(e) => handleProceedingChange(e.target.value)}
|
||||
disabled={typesLoading}
|
||||
className={inputClass}
|
||||
>
|
||||
<option value="">Bitte wählen...</option>
|
||||
{proceedingTypes?.map((pt) => (
|
||||
<option key={pt.id} value={pt.code}>
|
||||
{pt.name} ({pt.code})
|
||||
</option>
|
||||
))}
|
||||
{(() => {
|
||||
const types = proceedingTypes ?? [];
|
||||
const categoryLabels: Record<string, string> = {
|
||||
hauptverfahren: "Hauptverfahren",
|
||||
im_verfahren: "Verfahren im Verfahren",
|
||||
rechtsbehelf: "Rechtsbehelfe",
|
||||
};
|
||||
const jurisdictionLabels: Record<string, string> = {
|
||||
UPC: "UPC",
|
||||
DE: "Deutsche Patentverfahren",
|
||||
};
|
||||
// Group by jurisdiction + category
|
||||
const groups: { key: string; label: string; items: typeof types }[] = [];
|
||||
const seen = new Set<string>();
|
||||
for (const pt of types) {
|
||||
const j = pt.jurisdiction ?? "Sonstige";
|
||||
const c = pt.category ?? "hauptverfahren";
|
||||
const key = `${j}::${c}`;
|
||||
if (!seen.has(key)) {
|
||||
seen.add(key);
|
||||
const jLabel = jurisdictionLabels[j] ?? j;
|
||||
const cLabel = categoryLabels[c] ?? c;
|
||||
const label = j === "DE" ? jLabel : `${jLabel} — ${cLabel}`;
|
||||
groups.push({ key, label, items: [] });
|
||||
}
|
||||
groups.find((g) => g.key === key)!.items.push(pt);
|
||||
}
|
||||
return groups.map((g) => (
|
||||
<optgroup key={g.key} label={g.label}>
|
||||
{g.items.map((pt) => (
|
||||
<option key={pt.id} value={pt.code}>
|
||||
{pt.name}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
));
|
||||
})()}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
@@ -97,7 +146,7 @@ export function DeadlineCalculator() {
|
||||
<input
|
||||
type="date"
|
||||
value={triggerDate}
|
||||
onChange={(e) => setTriggerDate(e.target.value)}
|
||||
onChange={(e) => handleDateChange(e.target.value)}
|
||||
className={inputClass}
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -276,32 +276,53 @@ export function DeadlineWizard() {
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="mt-4 grid grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6">
|
||||
<div className="mt-4 space-y-4">
|
||||
{typesLoading ? (
|
||||
<div className="col-span-full flex justify-center py-4">
|
||||
<div className="flex justify-center py-4">
|
||||
<Loader2 className="h-5 w-5 animate-spin text-neutral-400" />
|
||||
</div>
|
||||
) : (
|
||||
proceedingTypes?.map((pt) => (
|
||||
<button
|
||||
key={pt.id}
|
||||
onClick={() => handleTypeSelect(pt.code)}
|
||||
className={`rounded-lg border px-3 py-2.5 text-left transition-all ${
|
||||
selectedType === pt.code
|
||||
? "border-neutral-900 bg-neutral-900 text-white shadow-sm"
|
||||
: "border-neutral-200 bg-white text-neutral-700 hover:border-neutral-400 hover:bg-neutral-50"
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<div
|
||||
className="h-2 w-2 rounded-full"
|
||||
style={{ backgroundColor: pt.default_color }}
|
||||
/>
|
||||
<span className="text-xs font-semibold">{pt.code}</span>
|
||||
(() => {
|
||||
const grouped = new Map<string, ProceedingType[]>();
|
||||
for (const pt of proceedingTypes ?? []) {
|
||||
const key = pt.jurisdiction ?? "Sonstige";
|
||||
if (!grouped.has(key)) grouped.set(key, []);
|
||||
grouped.get(key)!.push(pt);
|
||||
}
|
||||
const labels: Record<string, string> = {
|
||||
UPC: "UPC-Verfahren",
|
||||
DE: "Deutsche Patentverfahren",
|
||||
};
|
||||
return Array.from(grouped.entries()).map(([jurisdiction, types]) => (
|
||||
<div key={jurisdiction}>
|
||||
<div className="mb-2 text-xs font-medium text-neutral-500">
|
||||
{labels[jurisdiction] ?? jurisdiction}
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-2 sm:grid-cols-3 lg:grid-cols-6">
|
||||
{types.map((pt) => (
|
||||
<button
|
||||
key={pt.id}
|
||||
onClick={() => handleTypeSelect(pt.code)}
|
||||
className={`rounded-lg border px-3 py-2.5 text-left transition-all ${
|
||||
selectedType === pt.code
|
||||
? "border-neutral-900 bg-neutral-900 text-white shadow-sm"
|
||||
: "border-neutral-200 bg-white text-neutral-700 hover:border-neutral-400 hover:bg-neutral-50"
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<div
|
||||
className="h-2 w-2 rounded-full"
|
||||
style={{ backgroundColor: pt.default_color }}
|
||||
/>
|
||||
<span className="text-xs font-semibold">{pt.code}</span>
|
||||
</div>
|
||||
<div className="mt-1 text-xs leading-tight opacity-80">{pt.name}</div>
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-1 text-xs leading-tight opacity-80">{pt.name}</div>
|
||||
</button>
|
||||
))
|
||||
));
|
||||
})()
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
@@ -444,7 +465,7 @@ export function DeadlineWizard() {
|
||||
<Scale className="h-6 w-6 text-neutral-400" />
|
||||
</div>
|
||||
<p className="mt-3 text-sm font-medium text-neutral-700">
|
||||
UPC-Fristenbestimmung
|
||||
Fristenbestimmung
|
||||
</p>
|
||||
<p className="mt-1 max-w-sm text-xs text-neutral-500">
|
||||
Waehlen Sie die Verfahrensart und geben Sie das Datum des ausloesenden Ereignisses ein.
|
||||
|
||||
@@ -164,7 +164,7 @@ export function TeamSettings() {
|
||||
</div>
|
||||
<div>
|
||||
<p className="text-sm font-medium text-neutral-900">
|
||||
{member.user_id.slice(0, 8)}...
|
||||
{member.email || member.user_id.slice(0, 8) + "..."}
|
||||
</p>
|
||||
<p className="text-xs text-neutral-500">{roleInfo.label}</p>
|
||||
</div>
|
||||
|
||||
@@ -15,6 +15,7 @@ export interface UserTenant {
|
||||
user_id: string;
|
||||
tenant_id: string;
|
||||
role: string;
|
||||
email: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
@@ -196,6 +197,7 @@ export interface ProceedingType {
|
||||
name: string;
|
||||
description?: string;
|
||||
jurisdiction?: string;
|
||||
category?: string;
|
||||
default_color: string;
|
||||
sort_order: number;
|
||||
is_active: boolean;
|
||||
|
||||
Reference in New Issue
Block a user