mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
Merge pull request #1106 from DJKnaeckebrot/fix/styling-after-sidebar-fixes
fix(style): clean up sidebar related style issue
This commit is contained in:
@@ -53,7 +53,7 @@ export const ShowContainers = ({ serverId }: Props) => {
|
|||||||
|
|
||||||
const [sorting, setSorting] = React.useState<SortingState>([]);
|
const [sorting, setSorting] = React.useState<SortingState>([]);
|
||||||
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
|
const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
|
||||||
[],
|
[]
|
||||||
);
|
);
|
||||||
const [columnVisibility, setColumnVisibility] =
|
const [columnVisibility, setColumnVisibility] =
|
||||||
React.useState<VisibilityState>({});
|
React.useState<VisibilityState>({});
|
||||||
@@ -80,7 +80,7 @@ export const ShowContainers = ({ serverId }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-8xl mx-auto">
|
<Card className="h-full bg-sidebar p-2.5 rounded-xl">
|
||||||
<div className="rounded-xl bg-background shadow-md ">
|
<div className="rounded-xl bg-background shadow-md ">
|
||||||
<CardHeader className="">
|
<CardHeader className="">
|
||||||
<CardTitle className="text-xl flex flex-row gap-2">
|
<CardTitle className="text-xl flex flex-row gap-2">
|
||||||
@@ -163,7 +163,7 @@ export const ShowContainers = ({ serverId }: Props) => {
|
|||||||
? null
|
? null
|
||||||
: flexRender(
|
: flexRender(
|
||||||
header.column.columnDef.header,
|
header.column.columnDef.header,
|
||||||
header.getContext(),
|
header.getContext()
|
||||||
)}
|
)}
|
||||||
</TableHead>
|
</TableHead>
|
||||||
);
|
);
|
||||||
@@ -182,7 +182,7 @@ export const ShowContainers = ({ serverId }: Props) => {
|
|||||||
<TableCell key={cell.id}>
|
<TableCell key={cell.id}>
|
||||||
{flexRender(
|
{flexRender(
|
||||||
cell.column.columnDef.cell,
|
cell.column.columnDef.cell,
|
||||||
cell.getContext(),
|
cell.getContext()
|
||||||
)}
|
)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -30,12 +30,12 @@ export const ShowTraefikSystem = ({ serverId }: Props) => {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
retry: 2,
|
retry: 2,
|
||||||
},
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-8xl mx-auto">
|
<Card className="h-full bg-sidebar p-2.5 rounded-xl">
|
||||||
<div className="rounded-xl bg-background shadow-md ">
|
<div className="rounded-xl bg-background shadow-md ">
|
||||||
<CardHeader className="">
|
<CardHeader className="">
|
||||||
<CardTitle className="text-xl flex flex-row gap-2">
|
<CardTitle className="text-xl flex flex-row gap-2">
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { DockerMonitoring } from "../docker/show";
|
|||||||
|
|
||||||
export const ShowMonitoring = () => {
|
export const ShowMonitoring = () => {
|
||||||
return (
|
return (
|
||||||
<div className="my-6 w-full ">
|
<div className="w-full">
|
||||||
<DockerMonitoring appName="dokploy" />
|
<DockerMonitoring appName="dokploy" />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ export default function SwarmMonitorCard({ serverId }: Props) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="h-full bg-sidebar p-2.5 rounded-xl max-w-8xl mx-auto w-full">
|
<Card className="h-full bg-sidebar p-2.5 rounded-xl mx-auto w-full">
|
||||||
<div className="rounded-xl bg-background shadow-md p-6 flex flex-col gap-4">
|
<div className="rounded-xl bg-background shadow-md p-6 flex flex-col gap-4">
|
||||||
<header className="flex items-center justify-between">
|
<header className="flex items-center justify-between">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
@@ -94,7 +94,7 @@ export default function SwarmMonitorCard({ serverId }: Props) {
|
|||||||
)}
|
)}
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<div className="grid gap-6 md:grid-cols-3">
|
<div className="grid gap-6 lg:grid-cols-3">
|
||||||
<Card className="bg-background">
|
<Card className="bg-background">
|
||||||
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
|
<CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
|
||||||
<CardTitle className="text-sm font-medium">Total Nodes</CardTitle>
|
<CardTitle className="text-sm font-medium">Total Nodes</CardTitle>
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
BlocksIcon,
|
BlocksIcon,
|
||||||
BookIcon,
|
BookIcon,
|
||||||
ChevronRight,
|
ChevronRight,
|
||||||
|
CircleHelp,
|
||||||
Command,
|
Command,
|
||||||
CreditCard,
|
CreditCard,
|
||||||
Database,
|
Database,
|
||||||
@@ -127,7 +128,7 @@ const data = {
|
|||||||
isActive: false,
|
isActive: false,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: "File System",
|
title: "Traefik File System",
|
||||||
url: "/dashboard/traefik",
|
url: "/dashboard/traefik",
|
||||||
icon: GalleryVerticalEnd,
|
icon: GalleryVerticalEnd,
|
||||||
isSingle: true,
|
isSingle: true,
|
||||||
@@ -317,9 +318,15 @@ const data = {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "Support",
|
name: "Support",
|
||||||
|
url: "https://discord.gg/2tBnJ3jDJc",
|
||||||
|
icon: CircleHelp,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Sponsor",
|
||||||
url: "https://opencollective.com/dokploy",
|
url: "https://opencollective.com/dokploy",
|
||||||
icon: Heart,
|
icon: Heart,
|
||||||
},
|
},
|
||||||
|
|
||||||
// {
|
// {
|
||||||
// name: "Sales & Marketing",
|
// name: "Sales & Marketing",
|
||||||
// url: "#",
|
// url: "#",
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ const Page = () => {
|
|||||||
const { data: isCloud } = api.settings.isCloud.useQuery();
|
const { data: isCloud } = api.settings.isCloud.useQuery();
|
||||||
return (
|
return (
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<div className="h-full p-2.5 rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
|
<div className="h-full rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
|
||||||
<ProfileForm />
|
<ProfileForm />
|
||||||
{(user?.canAccessToAPI || data?.rol === "admin") && <GenerateToken />}
|
{(user?.canAccessToAPI || data?.rol === "admin") && <GenerateToken />}
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import superjson from "superjson";
|
|||||||
const Page = () => {
|
const Page = () => {
|
||||||
return (
|
return (
|
||||||
<div className="w-full">
|
<div className="w-full">
|
||||||
<div className="h-full p-2.5 rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
|
<div className="h-full rounded-xl max-w-5xl mx-auto flex flex-col gap-4">
|
||||||
<WebDomain />
|
<WebDomain />
|
||||||
<WebServer />
|
<WebServer />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user