From f5b259cae2380bcfa4a347191352b26a42726833 Mon Sep 17 00:00:00 2001 From: hwinkel Date: Fri, 13 Mar 2026 14:20:07 +0100 Subject: [PATCH] ADD: prisma fix --- app/lib/{invoice-number.ts => invoice-number.server.ts} | 2 +- app/lib/{logger.ts => logger.server.ts} | 2 +- app/lib/{prisma.ts => prisma.server.ts} | 0 app/routes/admin.logs.tsx | 2 +- app/routes/admin.users.$id.tsx | 4 ++-- app/routes/admin.users.new.tsx | 4 ++-- app/routes/admin.users.tsx | 2 +- app/routes/api.companies.$id.customers.ts | 2 +- app/routes/api.companies.$id.invoices.ts | 2 +- app/routes/api.companies.$id.ts | 2 +- app/routes/api.companies.ts | 2 +- app/routes/api.customers.$id.ts | 2 +- app/routes/api.customers.ts | 2 +- app/routes/api.invoices.$id.pdf.ts | 2 +- app/routes/api.invoices.$id.ts | 2 +- app/routes/api.invoices.ts | 4 ++-- app/routes/api.reports.ts | 2 +- app/routes/archiv.tsx | 2 +- app/routes/companies.$id.customers.tsx | 2 +- app/routes/companies.$id.edit.tsx | 2 +- app/routes/companies.$id.invoices.$invoiceId.tsx | 2 +- app/routes/companies.$id.invoices.new.tsx | 2 +- app/routes/companies.$id.invoices.tsx | 2 +- app/routes/companies.$id.reports.tsx | 2 +- app/routes/companies.$id.tsx | 2 +- app/routes/companies.tsx | 2 +- app/routes/home.tsx | 2 +- app/routes/settings.password.tsx | 4 ++-- app/session.server.ts | 6 +++--- 29 files changed, 34 insertions(+), 34 deletions(-) rename app/lib/{invoice-number.ts => invoice-number.server.ts} (92%) rename app/lib/{logger.ts => logger.server.ts} (96%) rename app/lib/{prisma.ts => prisma.server.ts} (100%) diff --git a/app/lib/invoice-number.ts b/app/lib/invoice-number.server.ts similarity index 92% rename from app/lib/invoice-number.ts rename to app/lib/invoice-number.server.ts index e8baba6..8b8955f 100644 --- a/app/lib/invoice-number.ts +++ b/app/lib/invoice-number.server.ts @@ -1,4 +1,4 @@ -import prisma from "./prisma"; +import prisma from "./prisma.server"; export async function generateInvoiceNumber(companyId: string): Promise { const year = new Date().getFullYear(); diff --git a/app/lib/logger.ts b/app/lib/logger.server.ts similarity index 96% rename from app/lib/logger.ts rename to app/lib/logger.server.ts index b54002e..5c0d516 100644 --- a/app/lib/logger.ts +++ b/app/lib/logger.server.ts @@ -1,4 +1,4 @@ -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; export type LogAction = | "LOGIN" diff --git a/app/lib/prisma.ts b/app/lib/prisma.server.ts similarity index 100% rename from app/lib/prisma.ts rename to app/lib/prisma.server.ts diff --git a/app/routes/admin.logs.tsx b/app/routes/admin.logs.tsx index 584ee79..af0bcca 100644 --- a/app/routes/admin.logs.tsx +++ b/app/routes/admin.logs.tsx @@ -1,6 +1,6 @@ import { useLoaderData } from "react-router"; import { requireAdmin } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; const ACTION_LABELS: Record = { LOGIN: "Anmeldung", diff --git a/app/routes/admin.users.$id.tsx b/app/routes/admin.users.$id.tsx index 17b47b4..20e905c 100644 --- a/app/routes/admin.users.$id.tsx +++ b/app/routes/admin.users.$id.tsx @@ -7,8 +7,8 @@ import { Link, } from "react-router"; import { requireAdmin } from "@/session.server"; -import { log } from "@/lib/logger"; -import prisma from "@/lib/prisma"; +import { log } from "@/lib/logger.server"; +import prisma from "@/lib/prisma.server"; import bcrypt from "bcryptjs"; import { AlertCircle, ArrowLeft, Trash2 } from "lucide-react"; import { Button } from "@/components/ui/button"; diff --git a/app/routes/admin.users.new.tsx b/app/routes/admin.users.new.tsx index f582e50..d68e6b9 100644 --- a/app/routes/admin.users.new.tsx +++ b/app/routes/admin.users.new.tsx @@ -1,7 +1,7 @@ import { Form, useActionData, useNavigation, redirect, Link } from "react-router"; import { requireAdmin } from "@/session.server"; -import { log } from "@/lib/logger"; -import prisma from "@/lib/prisma"; +import { log } from "@/lib/logger.server"; +import prisma from "@/lib/prisma.server"; import bcrypt from "bcryptjs"; import { AlertCircle, ArrowLeft } from "lucide-react"; import { Button } from "@/components/ui/button"; diff --git a/app/routes/admin.users.tsx b/app/routes/admin.users.tsx index 8c59f5f..505f33d 100644 --- a/app/routes/admin.users.tsx +++ b/app/routes/admin.users.tsx @@ -1,6 +1,6 @@ import { Link, useLoaderData } from "react-router"; import { requireAdmin } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { UserPlus, Shield, User } from "lucide-react"; export async function loader({ request }: { request: Request }) { diff --git a/app/routes/api.companies.$id.customers.ts b/app/routes/api.companies.$id.customers.ts index d7296d7..44fe97d 100644 --- a/app/routes/api.companies.$id.customers.ts +++ b/app/routes/api.companies.$id.customers.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; export async function loader({ request, params }: { request: Request; params: { id: string } }) { const user = await getApiUser(request); diff --git a/app/routes/api.companies.$id.invoices.ts b/app/routes/api.companies.$id.invoices.ts index 3406826..f917a62 100644 --- a/app/routes/api.companies.$id.invoices.ts +++ b/app/routes/api.companies.$id.invoices.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; export async function loader({ request, params }: { request: Request; params: { id: string } }) { const user = await getApiUser(request); diff --git a/app/routes/api.companies.$id.ts b/app/routes/api.companies.$id.ts index 3b051d1..d5433a9 100644 --- a/app/routes/api.companies.$id.ts +++ b/app/routes/api.companies.$id.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { z } from "zod"; const companySchema = z.object({ diff --git a/app/routes/api.companies.ts b/app/routes/api.companies.ts index 79a6764..f1bc6e2 100644 --- a/app/routes/api.companies.ts +++ b/app/routes/api.companies.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { z } from "zod"; const companySchema = z.object({ diff --git a/app/routes/api.customers.$id.ts b/app/routes/api.customers.$id.ts index 578b067..5e9d74c 100644 --- a/app/routes/api.customers.$id.ts +++ b/app/routes/api.customers.$id.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { z } from "zod"; const customerSchema = z.object({ diff --git a/app/routes/api.customers.ts b/app/routes/api.customers.ts index 2f54e0d..2ee3360 100644 --- a/app/routes/api.customers.ts +++ b/app/routes/api.customers.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { z } from "zod"; const customerSchema = z.object({ diff --git a/app/routes/api.invoices.$id.pdf.ts b/app/routes/api.invoices.$id.pdf.ts index 12bcbae..9043641 100644 --- a/app/routes/api.invoices.$id.pdf.ts +++ b/app/routes/api.invoices.$id.pdf.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; export async function loader({ request, params }: { request: Request; params: { id: string } }) { const user = await getApiUser(request); diff --git a/app/routes/api.invoices.$id.ts b/app/routes/api.invoices.$id.ts index 7dbb951..09048de 100644 --- a/app/routes/api.invoices.$id.ts +++ b/app/routes/api.invoices.$id.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { InvoiceStatus } from "@prisma/client"; import { z } from "zod"; diff --git a/app/routes/api.invoices.ts b/app/routes/api.invoices.ts index a018a78..9a863e3 100644 --- a/app/routes/api.invoices.ts +++ b/app/routes/api.invoices.ts @@ -1,6 +1,6 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; -import { generateInvoiceNumber } from "@/lib/invoice-number"; +import prisma from "@/lib/prisma.server"; +import { generateInvoiceNumber } from "@/lib/invoice-number.server"; import { z } from "zod"; const itemSchema = z.object({ diff --git a/app/routes/api.reports.ts b/app/routes/api.reports.ts index 3a615bc..9548d87 100644 --- a/app/routes/api.reports.ts +++ b/app/routes/api.reports.ts @@ -1,5 +1,5 @@ import { getApiUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { InvoiceStatus } from "@prisma/client"; export async function loader({ request }: { request: Request }) { diff --git a/app/routes/archiv.tsx b/app/routes/archiv.tsx index 20cc639..a6fdff9 100644 --- a/app/routes/archiv.tsx +++ b/app/routes/archiv.tsx @@ -1,6 +1,6 @@ import { Link, useLoaderData } from "react-router"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { formatCurrency } from "@/lib/tax"; import { Archive, Building2, FileText, Users, ArchiveRestore } from "lucide-react"; import { useRevalidator } from "react-router"; diff --git a/app/routes/companies.$id.customers.tsx b/app/routes/companies.$id.customers.tsx index 8fc53f9..fe61fe2 100644 --- a/app/routes/companies.$id.customers.tsx +++ b/app/routes/companies.$id.customers.tsx @@ -9,7 +9,7 @@ export const handle = { ], }; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Button } from "@/components/ui/button"; import { Card, CardContent } from "@/components/ui/card"; import { Input } from "@/components/ui/input"; diff --git a/app/routes/companies.$id.edit.tsx b/app/routes/companies.$id.edit.tsx index bfdf43b..dbd1be1 100644 --- a/app/routes/companies.$id.edit.tsx +++ b/app/routes/companies.$id.edit.tsx @@ -8,7 +8,7 @@ export const handle = { ], }; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { CompanyForm } from "@/components/company/company-form"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { ChevronLeft } from "lucide-react"; diff --git a/app/routes/companies.$id.invoices.$invoiceId.tsx b/app/routes/companies.$id.invoices.$invoiceId.tsx index c058660..5ff78e2 100644 --- a/app/routes/companies.$id.invoices.$invoiceId.tsx +++ b/app/routes/companies.$id.invoices.$invoiceId.tsx @@ -9,7 +9,7 @@ export const handle = { ], }; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { useState } from "react"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Button } from "@/components/ui/button"; diff --git a/app/routes/companies.$id.invoices.new.tsx b/app/routes/companies.$id.invoices.new.tsx index 92fac9b..228d93a 100644 --- a/app/routes/companies.$id.invoices.new.tsx +++ b/app/routes/companies.$id.invoices.new.tsx @@ -9,7 +9,7 @@ export const handle = { ], }; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { InvoiceForm } from "@/components/invoice/invoice-form"; import { ChevronLeft } from "lucide-react"; diff --git a/app/routes/companies.$id.invoices.tsx b/app/routes/companies.$id.invoices.tsx index 84b2849..bc00226 100644 --- a/app/routes/companies.$id.invoices.tsx +++ b/app/routes/companies.$id.invoices.tsx @@ -8,7 +8,7 @@ export const handle = { ], }; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Button } from "@/components/ui/button"; import { Card } from "@/components/ui/card"; import { InvoiceStatusBadge } from "@/components/invoice/invoice-status-badge"; diff --git a/app/routes/companies.$id.reports.tsx b/app/routes/companies.$id.reports.tsx index f260585..f236612 100644 --- a/app/routes/companies.$id.reports.tsx +++ b/app/routes/companies.$id.reports.tsx @@ -1,7 +1,7 @@ import { useState, useEffect } from "react"; import { Link, useLoaderData } from "react-router"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { formatCurrency } from "@/lib/tax"; import { ChevronLeft, TrendingUp, BarChart3 } from "lucide-react"; diff --git a/app/routes/companies.$id.tsx b/app/routes/companies.$id.tsx index 77b6775..af1686a 100644 --- a/app/routes/companies.$id.tsx +++ b/app/routes/companies.$id.tsx @@ -1,6 +1,6 @@ import { Link, useLoaderData, useRevalidator } from "react-router"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Button } from "@/components/ui/button"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Badge } from "@/components/ui/badge"; diff --git a/app/routes/companies.tsx b/app/routes/companies.tsx index 9cd9cb0..77e38d1 100644 --- a/app/routes/companies.tsx +++ b/app/routes/companies.tsx @@ -1,7 +1,7 @@ import { Link, useLoaderData } from "react-router"; import { useState } from "react"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { Button } from "@/components/ui/button"; import { Badge } from "@/components/ui/badge"; import { formatCurrency, formatDate } from "@/lib/tax"; diff --git a/app/routes/home.tsx b/app/routes/home.tsx index 3df1c25..875d4d8 100644 --- a/app/routes/home.tsx +++ b/app/routes/home.tsx @@ -1,6 +1,6 @@ import { Link, useLoaderData } from "react-router"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import { formatCurrency } from "@/lib/tax"; import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; import { Building2, FileText, Euro, TrendingUp } from "lucide-react"; diff --git a/app/routes/settings.password.tsx b/app/routes/settings.password.tsx index fb9b25f..0cba844 100644 --- a/app/routes/settings.password.tsx +++ b/app/routes/settings.password.tsx @@ -1,8 +1,8 @@ import { Form, useActionData, useNavigation } from "react-router"; import { requireUser } from "@/session.server"; -import prisma from "@/lib/prisma"; +import prisma from "@/lib/prisma.server"; import bcrypt from "bcryptjs"; -import { log } from "@/lib/logger"; +import { log } from "@/lib/logger.server"; import { Button } from "@/components/ui/button"; import { KeyRound, CheckCircle2 } from "lucide-react"; diff --git a/app/session.server.ts b/app/session.server.ts index 8bc1b52..62a66b1 100644 --- a/app/session.server.ts +++ b/app/session.server.ts @@ -1,7 +1,7 @@ import { createCookieSessionStorage, redirect } from "react-router"; import bcrypt from "bcryptjs"; -import prisma from "@/lib/prisma"; -import { log } from "@/lib/logger"; +import prisma from "@/lib/prisma.server"; +import { log } from "@/lib/logger.server"; const sessionStorage = createCookieSessionStorage({ cookie: { @@ -11,7 +11,7 @@ const sessionStorage = createCookieSessionStorage({ path: "/", sameSite: "lax", secrets: [process.env.AUTH_SECRET ?? "fallback-secret-change-in-production"], - secure: process.env.NODE_ENV === "production", + secure: process.env.SESSION_SECURE === "true", }, });