ADD: prisma fix
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
import prisma from "./prisma";
|
import prisma from "./prisma.server";
|
||||||
|
|
||||||
export async function generateInvoiceNumber(companyId: string): Promise<string> {
|
export async function generateInvoiceNumber(companyId: string): Promise<string> {
|
||||||
const year = new Date().getFullYear();
|
const year = new Date().getFullYear();
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
|
|
||||||
export type LogAction =
|
export type LogAction =
|
||||||
| "LOGIN"
|
| "LOGIN"
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
import { useLoaderData } from "react-router";
|
import { useLoaderData } from "react-router";
|
||||||
import { requireAdmin } from "@/session.server";
|
import { requireAdmin } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
|
|
||||||
const ACTION_LABELS: Record<string, string> = {
|
const ACTION_LABELS: Record<string, string> = {
|
||||||
LOGIN: "Anmeldung",
|
LOGIN: "Anmeldung",
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import {
|
|||||||
Link,
|
Link,
|
||||||
} from "react-router";
|
} from "react-router";
|
||||||
import { requireAdmin } from "@/session.server";
|
import { requireAdmin } from "@/session.server";
|
||||||
import { log } from "@/lib/logger";
|
import { log } from "@/lib/logger.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import { AlertCircle, ArrowLeft, Trash2 } from "lucide-react";
|
import { AlertCircle, ArrowLeft, Trash2 } from "lucide-react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Form, useActionData, useNavigation, redirect, Link } from "react-router";
|
import { Form, useActionData, useNavigation, redirect, Link } from "react-router";
|
||||||
import { requireAdmin } from "@/session.server";
|
import { requireAdmin } from "@/session.server";
|
||||||
import { log } from "@/lib/logger";
|
import { log } from "@/lib/logger.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import { AlertCircle, ArrowLeft } from "lucide-react";
|
import { AlertCircle, ArrowLeft } from "lucide-react";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Link, useLoaderData } from "react-router";
|
import { Link, useLoaderData } from "react-router";
|
||||||
import { requireAdmin } from "@/session.server";
|
import { requireAdmin } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { UserPlus, Shield, User } from "lucide-react";
|
import { UserPlus, Shield, User } from "lucide-react";
|
||||||
|
|
||||||
export async function loader({ request }: { request: Request }) {
|
export async function loader({ request }: { request: Request }) {
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
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 } }) {
|
export async function loader({ request, params }: { request: Request; params: { id: string } }) {
|
||||||
const user = await getApiUser(request);
|
const user = await getApiUser(request);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
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 } }) {
|
export async function loader({ request, params }: { request: Request; params: { id: string } }) {
|
||||||
const user = await getApiUser(request);
|
const user = await getApiUser(request);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const companySchema = z.object({
|
const companySchema = z.object({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const companySchema = z.object({
|
const companySchema = z.object({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const customerSchema = z.object({
|
const customerSchema = z.object({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const customerSchema = z.object({
|
const customerSchema = z.object({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
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 } }) {
|
export async function loader({ request, params }: { request: Request; params: { id: string } }) {
|
||||||
const user = await getApiUser(request);
|
const user = await getApiUser(request);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { InvoiceStatus } from "@prisma/client";
|
import { InvoiceStatus } from "@prisma/client";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { generateInvoiceNumber } from "@/lib/invoice-number";
|
import { generateInvoiceNumber } from "@/lib/invoice-number.server";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
const itemSchema = z.object({
|
const itemSchema = z.object({
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { getApiUser } from "@/session.server";
|
import { getApiUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { InvoiceStatus } from "@prisma/client";
|
import { InvoiceStatus } from "@prisma/client";
|
||||||
|
|
||||||
export async function loader({ request }: { request: Request }) {
|
export async function loader({ request }: { request: Request }) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Link, useLoaderData } from "react-router";
|
import { Link, useLoaderData } from "react-router";
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { formatCurrency } from "@/lib/tax";
|
import { formatCurrency } from "@/lib/tax";
|
||||||
import { Archive, Building2, FileText, Users, ArchiveRestore } from "lucide-react";
|
import { Archive, Building2, FileText, Users, ArchiveRestore } from "lucide-react";
|
||||||
import { useRevalidator } from "react-router";
|
import { useRevalidator } from "react-router";
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const handle = {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent } from "@/components/ui/card";
|
import { Card, CardContent } from "@/components/ui/card";
|
||||||
import { Input } from "@/components/ui/input";
|
import { Input } from "@/components/ui/input";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export const handle = {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { CompanyForm } from "@/components/company/company-form";
|
import { CompanyForm } from "@/components/company/company-form";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { ChevronLeft } from "lucide-react";
|
import { ChevronLeft } from "lucide-react";
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const handle = {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ export const handle = {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
import { requireUser } from "@/session.server";
|
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 { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { InvoiceForm } from "@/components/invoice/invoice-form";
|
import { InvoiceForm } from "@/components/invoice/invoice-form";
|
||||||
import { ChevronLeft } from "lucide-react";
|
import { ChevronLeft } from "lucide-react";
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export const handle = {
|
|||||||
],
|
],
|
||||||
};
|
};
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { InvoiceStatusBadge } from "@/components/invoice/invoice-status-badge";
|
import { InvoiceStatusBadge } from "@/components/invoice/invoice-status-badge";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { useState, useEffect } from "react";
|
import { useState, useEffect } from "react";
|
||||||
import { Link, useLoaderData } from "react-router";
|
import { Link, useLoaderData } from "react-router";
|
||||||
import { requireUser } from "@/session.server";
|
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 { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { formatCurrency } from "@/lib/tax";
|
import { formatCurrency } from "@/lib/tax";
|
||||||
import { ChevronLeft, TrendingUp, BarChart3 } from "lucide-react";
|
import { ChevronLeft, TrendingUp, BarChart3 } from "lucide-react";
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { Link, useLoaderData, useRevalidator } from "react-router";
|
import { Link, useLoaderData, useRevalidator } from "react-router";
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { Link, useLoaderData } from "react-router";
|
import { Link, useLoaderData } from "react-router";
|
||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Badge } from "@/components/ui/badge";
|
import { Badge } from "@/components/ui/badge";
|
||||||
import { formatCurrency, formatDate } from "@/lib/tax";
|
import { formatCurrency, formatDate } from "@/lib/tax";
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
import { Link, useLoaderData } from "react-router";
|
import { Link, useLoaderData } from "react-router";
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { formatCurrency } from "@/lib/tax";
|
import { formatCurrency } from "@/lib/tax";
|
||||||
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
|
||||||
import { Building2, FileText, Euro, TrendingUp } from "lucide-react";
|
import { Building2, FileText, Euro, TrendingUp } from "lucide-react";
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import { Form, useActionData, useNavigation } from "react-router";
|
import { Form, useActionData, useNavigation } from "react-router";
|
||||||
import { requireUser } from "@/session.server";
|
import { requireUser } from "@/session.server";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import { log } from "@/lib/logger";
|
import { log } from "@/lib/logger.server";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { KeyRound, CheckCircle2 } from "lucide-react";
|
import { KeyRound, CheckCircle2 } from "lucide-react";
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { createCookieSessionStorage, redirect } from "react-router";
|
import { createCookieSessionStorage, redirect } from "react-router";
|
||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import prisma from "@/lib/prisma";
|
import prisma from "@/lib/prisma.server";
|
||||||
import { log } from "@/lib/logger";
|
import { log } from "@/lib/logger.server";
|
||||||
|
|
||||||
const sessionStorage = createCookieSessionStorage({
|
const sessionStorage = createCookieSessionStorage({
|
||||||
cookie: {
|
cookie: {
|
||||||
@@ -11,7 +11,7 @@ const sessionStorage = createCookieSessionStorage({
|
|||||||
path: "/",
|
path: "/",
|
||||||
sameSite: "lax",
|
sameSite: "lax",
|
||||||
secrets: [process.env.AUTH_SECRET ?? "fallback-secret-change-in-production"],
|
secrets: [process.env.AUTH_SECRET ?? "fallback-secret-change-in-production"],
|
||||||
secure: process.env.NODE_ENV === "production",
|
secure: process.env.SESSION_SECURE === "true",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user