Type fixes & Docker

This commit is contained in:
headlessdev
2025-04-13 21:10:17 +02:00
parent dcce66a449
commit eadaf75b74
76 changed files with 21644 additions and 264 deletions

View File

@@ -1,5 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
import { prisma } from "@/lib/prisma";
interface AddRequest {
serverId: number;
@@ -10,8 +10,6 @@ interface AddRequest {
localURL: string;
}
const prisma = new PrismaClient();
export async function POST(request: NextRequest) {
try {
const body: AddRequest = await request.json();

View File

@@ -1,7 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
const prisma = new PrismaClient();
import { prisma } from "@/lib/prisma";
export async function POST(request: NextRequest) {
try {

View File

@@ -1,53 +1,49 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
import { prisma } from "@/lib/prisma";
interface GetRequest {
page: number;
ITEMS_PER_PAGE: number;
interface PostRequest {
page?: number;
ITEMS_PER_PAGE?: number;
}
const prisma = new PrismaClient();
export async function POST(request: NextRequest) {
try {
const body: GetRequest = await request.json();
const page = Math.max(1, body.page || 1);
const ITEMS_PER_PAGE = body.ITEMS_PER_PAGE;
const applications = await prisma.application.findMany({
skip: (page - 1) * ITEMS_PER_PAGE,
take: ITEMS_PER_PAGE,
orderBy: { name: 'asc' }
});
try {
const body: PostRequest = await request.json();
const page = Math.max(1, body.page || 1);
const ITEMS_PER_PAGE = body.ITEMS_PER_PAGE || 10;
const serverIds = applications
.map(app => app.serverId)
.filter((id): id is number => id !== null);
const [applications, totalCount, servers_all] = await Promise.all([
prisma.application.findMany({
skip: (page - 1) * ITEMS_PER_PAGE,
take: ITEMS_PER_PAGE,
orderBy: { name: "asc" }
}),
prisma.application.count(),
prisma.server.findMany()
]);
const servers = await prisma.server.findMany({
where: {
id: {
in: serverIds
}
}
});
const serverIds = applications
.map((app: { serverId: number | null }) => app.serverId)
.filter((id:any): id is number => id !== null);
const servers_all = await prisma.server.findMany()
const servers = await prisma.server.findMany({
where: { id: { in: serverIds } }
});
const applicationsWithServers = applications.map(app => ({
...app,
server: servers.find(s => s.id === app.serverId)?.name || 'No server'
}));
const applicationsWithServers = applications.map((app: any) => ({
...app,
server: servers.find((s: any) => s.id === app.serverId)?.name || "No server"
}));
const totalCount = await prisma.application.count();
const maxPage = Math.ceil(totalCount / ITEMS_PER_PAGE);
const maxPage = Math.ceil(totalCount / ITEMS_PER_PAGE);
return NextResponse.json({
applications: applicationsWithServers,
servers: servers_all,
maxPage
});
} catch (error: any) {
return NextResponse.json({ error: error.message }, { status: 500 });
}
return NextResponse.json({
applications: applicationsWithServers,
servers: servers_all,
maxPage
});
} catch (error: unknown) {
const message = error instanceof Error ? error.message : "Unknown error";
return NextResponse.json({ error: message }, { status: 500 });
}
}

View File

@@ -1,7 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma';
const prisma = new PrismaClient();
import { prisma } from "@/lib/prisma";
export async function POST(request: NextRequest) {
try {

View File

@@ -1,7 +1,40 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from "@/lib/generated/prisma";
import { prisma } from "@/lib/prisma";
const prisma = new PrismaClient();
interface Node {
id: string;
type: string;
data: {
label: string;
[key: string]: any;
};
position: { x: number; y: number };
style: React.CSSProperties;
}
interface Edge {
id: string;
source: string;
target: string;
type: string;
style: {
stroke: string;
strokeWidth: number;
};
}
interface Server {
id: number;
name: string;
ip: string;
}
interface Application {
id: number;
name: string;
localURL: string;
serverId: number;
}
const NODE_WIDTH = 220;
const NODE_HEIGHT = 60;
@@ -15,13 +48,13 @@ export async function GET() {
const [servers, applications] = await Promise.all([
prisma.server.findMany({
orderBy: { id: "asc" },
}),
}) as Promise<Server[]>,
prisma.application.findMany({
orderBy: { serverId: "asc" },
}),
}) as Promise<Application[]>,
]);
const rootNode = {
const rootNode: Node = {
id: "root",
type: "infrastructure",
data: { label: "My Infrastructure" },
@@ -39,7 +72,7 @@ export async function GET() {
},
};
const serverNodes = servers.map((server, index) => {
const serverNodes: Node[] = servers.map((server, index) => {
const xPos =
index * HORIZONTAL_SPACING -
((servers.length - 1) * HORIZONTAL_SPACING) / 2;
@@ -67,11 +100,10 @@ export async function GET() {
};
});
const appNodes: any[] = [];
const appNodes: Node[] = [];
servers.forEach((server) => {
const serverX =
serverNodes.find((n) => n.id === `server-${server.id}`)?.position.x ||
0;
serverNodes.find((n) => n.id === `server-${server.id}`)?.position.x || 0;
const serverY = START_Y;
applications
@@ -104,7 +136,7 @@ export async function GET() {
});
});
const connections = [
const connections: Edge[] = [
...servers.map((server) => ({
id: `conn-root-${server.id}`,
source: "root",
@@ -131,12 +163,13 @@ export async function GET() {
nodes: [rootNode, ...serverNodes, ...appNodes],
edges: connections,
});
} catch (error: any) {
} catch (error: unknown) {
const errorMessage = error instanceof Error ? error.message : "Unknown error";
return NextResponse.json(
{
error: `Error fetching flowchart: ${error.message}`,
error: `Error fetching flowchart: ${errorMessage}`,
},
{ status: 500 }
);
}
}
}

View File

@@ -1,5 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
import { prisma } from "@/lib/prisma";
interface AddRequest {
name: string;
@@ -13,8 +13,6 @@ interface AddRequest {
}
const prisma = new PrismaClient();
export async function POST(request: NextRequest) {
try {
const body: AddRequest = await request.json();

View File

@@ -1,7 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
const prisma = new PrismaClient();
import { prisma } from "@/lib/prisma";
export async function POST(request: NextRequest) {
try {

View File

@@ -1,5 +1,5 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
import { prisma } from "@/lib/prisma";
interface EditRequest {
id: number;
@@ -13,8 +13,6 @@ interface EditRequest {
disk: string;
}
const prisma = new PrismaClient();
export async function PUT(request: NextRequest) {
try {
const body: EditRequest = await request.json();

View File

@@ -1,11 +1,10 @@
import { NextResponse, NextRequest } from "next/server";
import { PrismaClient } from '@/lib/generated/prisma'
import { prisma } from "@/lib/prisma";
interface GetRequest {
page: number;
}
const prisma = new PrismaClient();
const ITEMS_PER_PAGE = 5;
export async function POST(request: NextRequest) {