mirror of
https://github.com/Dokploy/dokploy.git
synced 2026-07-02 12:35:24 +02:00
* feat: update dependencies and enhance UI components in Dokploy - Updated various package versions in pnpm-lock.yaml to improve compatibility and performance, including React and Tailwind CSS. - Modified components.json to change the styling to "radix-nova" and added new properties for icon library and menu color. - Refactored multiple components to use updated class names for better styling consistency and responsiveness. - Removed unused Radix UI components from package.json to streamline dependencies. - Adjusted layout and styling in several dashboard components for improved user experience and visual appeal. - Enhanced tooltip and form item components for better accessibility and usability. * refactor: enhance UI components in HandleCertificate and SidebarLogo - Updated the HandleCertificate component to improve dialog content height and textarea styling for better usability. - Adjusted the SidebarLogo component layout to enhance alignment and spacing, ensuring a more consistent appearance across the sidebar. - Implemented responsive design adjustments to textarea elements, preventing overflow and improving user experience. * refactor: improve UI consistency and styling across dashboard components - Updated Card components in ShowDeployments, ShowSchedules, and ShowVolumeBackups to remove unnecessary border styles for a cleaner look. - Enhanced TabsList components in ShowProviderForm and ShowProviderFormCompose by adding a variant for improved visual distinction. - Adjusted spacing in AdvancedEnvironmentSelector for better layout and readability. - Removed redundant border classes in Service component for a more streamlined design. * [autofix.ci] apply automated fixes * chore: update package dependencies and refactor email rendering - Upgraded React and React DOM to version 19.2.7 across multiple packages for improved performance and compatibility. - Updated TSX to version 4.22.4 in various package.json files. - Refactored email rendering from `renderAsync` to `render` in notification utilities and email templates for consistency. - Adjusted Tailwind configuration usage in email templates to utilize a centralized configuration file. These changes enhance the overall stability and maintainability of the codebase. * refactor: update badge variants across dashboard components - Changed badge variant from "outline-solid" to "outline" in multiple components including columns, show-domains, and various deployment tables for consistency in styling. - Updated button variants in billing and project templates to align with the new badge styling. - Enhanced input components to support password generation and error messaging, improving user experience. These changes streamline the UI and ensure a cohesive design across the application. * refactor: clean up calendar component imports and structure - Removed redundant imports of icons from lucide-react and streamlined the import statements for better readability. - Adjusted the placement of type imports to enhance code organization. These changes improve the maintainability and clarity of the calendar component. * [autofix.ci] apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
199 lines
5.3 KiB
TypeScript
199 lines
5.3 KiB
TypeScript
import {
|
|
autocompletion,
|
|
type Completion,
|
|
type CompletionContext,
|
|
type CompletionResult,
|
|
} from "@codemirror/autocomplete";
|
|
import { css } from "@codemirror/lang-css";
|
|
import { json } from "@codemirror/lang-json";
|
|
import { yaml } from "@codemirror/lang-yaml";
|
|
import { StreamLanguage } from "@codemirror/language";
|
|
import { properties } from "@codemirror/legacy-modes/mode/properties";
|
|
import { shell } from "@codemirror/legacy-modes/mode/shell";
|
|
import { search, searchKeymap } from "@codemirror/search";
|
|
import { EditorView, keymap } from "@codemirror/view";
|
|
import { githubDark, githubLight } from "@uiw/codemirror-theme-github";
|
|
import CodeMirror, { type ReactCodeMirrorProps } from "@uiw/react-codemirror";
|
|
import { useTheme } from "next-themes";
|
|
import { cn } from "@/lib/utils";
|
|
|
|
// Docker Compose completion options
|
|
const dockerComposeServices = [
|
|
{ label: "services", type: "keyword", info: "Define services" },
|
|
{ label: "version", type: "keyword", info: "Specify compose file version" },
|
|
{ label: "volumes", type: "keyword", info: "Define volumes" },
|
|
{ label: "networks", type: "keyword", info: "Define networks" },
|
|
{ label: "configs", type: "keyword", info: "Define configuration files" },
|
|
{ label: "secrets", type: "keyword", info: "Define secrets" },
|
|
].map((opt) => ({
|
|
...opt,
|
|
apply: (
|
|
view: EditorView,
|
|
completion: Completion,
|
|
from: number,
|
|
to: number,
|
|
) => {
|
|
const insert = `${completion.label}:`;
|
|
view.dispatch({
|
|
changes: {
|
|
from,
|
|
to,
|
|
insert,
|
|
},
|
|
selection: { anchor: from + insert.length },
|
|
});
|
|
},
|
|
}));
|
|
|
|
const dockerComposeServiceOptions = [
|
|
{
|
|
label: "image",
|
|
type: "keyword",
|
|
info: "Specify the image to start the container from",
|
|
},
|
|
{ label: "build", type: "keyword", info: "Build configuration" },
|
|
{ label: "command", type: "keyword", info: "Override the default command" },
|
|
{ label: "container_name", type: "keyword", info: "Custom container name" },
|
|
{
|
|
label: "depends_on",
|
|
type: "keyword",
|
|
info: "Express dependency between services",
|
|
},
|
|
{ label: "environment", type: "keyword", info: "Add environment variables" },
|
|
{
|
|
label: "env_file",
|
|
type: "keyword",
|
|
info: "Add environment variables from a file",
|
|
},
|
|
{
|
|
label: "expose",
|
|
type: "keyword",
|
|
info: "Expose ports without publishing them",
|
|
},
|
|
{ label: "ports", type: "keyword", info: "Expose ports" },
|
|
{
|
|
label: "volumes",
|
|
type: "keyword",
|
|
info: "Mount host paths or named volumes",
|
|
},
|
|
{ label: "restart", type: "keyword", info: "Restart policy" },
|
|
{ label: "networks", type: "keyword", info: "Networks to join" },
|
|
].map((opt) => ({
|
|
...opt,
|
|
apply: (
|
|
view: EditorView,
|
|
completion: Completion,
|
|
from: number,
|
|
to: number,
|
|
) => {
|
|
const insert = `${completion.label}: `;
|
|
view.dispatch({
|
|
changes: {
|
|
from,
|
|
to,
|
|
insert,
|
|
},
|
|
selection: { anchor: from + insert.length },
|
|
});
|
|
},
|
|
}));
|
|
|
|
function dockerComposeComplete(
|
|
context: CompletionContext,
|
|
): CompletionResult | null {
|
|
const word = context.matchBefore(/\w*/);
|
|
if (!word || (!word.text && !context.explicit)) return null;
|
|
|
|
// Check if we're at the root level
|
|
const line = context.state.doc.lineAt(context.pos);
|
|
const indentation = /^\s*/.exec(line.text)?.[0].length || 0;
|
|
|
|
// If we're at the root level
|
|
if (indentation === 0) {
|
|
return {
|
|
from: word.from,
|
|
options: dockerComposeServices,
|
|
validFor: /^\w*$/,
|
|
};
|
|
}
|
|
|
|
// If we're inside a service definition
|
|
if (indentation === 4) {
|
|
return {
|
|
from: word.from,
|
|
options: dockerComposeServiceOptions,
|
|
validFor: /^\w*$/,
|
|
};
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
interface Props extends ReactCodeMirrorProps {
|
|
wrapperClassName?: string;
|
|
disabled?: boolean;
|
|
language?: "yaml" | "json" | "properties" | "shell" | "css";
|
|
lineWrapping?: boolean;
|
|
lineNumbers?: boolean;
|
|
}
|
|
|
|
export const CodeEditor = ({
|
|
className,
|
|
wrapperClassName,
|
|
language = "yaml",
|
|
lineNumbers = true,
|
|
...props
|
|
}: Props) => {
|
|
const { resolvedTheme } = useTheme();
|
|
return (
|
|
<div className={cn("overflow-auto", wrapperClassName)}>
|
|
<CodeMirror
|
|
basicSetup={{
|
|
lineNumbers,
|
|
foldGutter: true,
|
|
highlightSelectionMatches: true,
|
|
highlightActiveLine: !props.disabled,
|
|
allowMultipleSelections: true,
|
|
}}
|
|
theme={resolvedTheme === "dark" ? githubDark : githubLight}
|
|
extensions={[
|
|
search(),
|
|
keymap.of(searchKeymap),
|
|
language === "yaml"
|
|
? yaml()
|
|
: language === "json"
|
|
? json()
|
|
: language === "css"
|
|
? css()
|
|
: language === "shell"
|
|
? StreamLanguage.define(shell)
|
|
: StreamLanguage.define({
|
|
...properties,
|
|
// The legacy properties mode lacks comment metadata, so
|
|
// CodeMirror's toggle-comment shortcut (Mod-/) has no comment
|
|
// token to use. Declare `#` as the line comment for env editors.
|
|
languageData: { commentTokens: { line: "#" } },
|
|
}),
|
|
props.lineWrapping ? EditorView.lineWrapping : [],
|
|
language === "yaml"
|
|
? autocompletion({
|
|
override: [dockerComposeComplete],
|
|
})
|
|
: [],
|
|
]}
|
|
{...props}
|
|
editable={!props.disabled}
|
|
className={cn(
|
|
"w-full h-full text-sm leading-relaxed relative",
|
|
`cm-theme-${resolvedTheme}`,
|
|
className,
|
|
)}
|
|
>
|
|
{props.disabled && (
|
|
<div className="absolute top-0 rounded-md left-0 w-full h-full flex items-center justify-center z-10 [background:var(--overlay)] h-full" />
|
|
)}
|
|
</CodeMirror>
|
|
</div>
|
|
);
|
|
};
|