Skip to content

Commit 911b4fa

Browse files
committed
fix: improved ui of the template page
1 parent d1d825c commit 911b4fa

3 files changed

Lines changed: 78 additions & 57 deletions

File tree

‎src/app/template/[category]/[key]/page.tsx‎

Lines changed: 61 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client";
22

3-
import { use, useEffect, useMemo } from "react";
3+
import { use, useEffect, useMemo, useState } from "react";
44
import { useFormBuilderStore } from "@/stores/form-builder-store";
55
import GenerateCanvasGrid from "@/components/form-builder/canvas/generate-canvas-grid";
66
import { ToggleGroupNav } from "@/components/form-builder/ui/toggle-group-nav";
@@ -20,6 +20,9 @@ import {
2020
BreadcrumbSeparator,
2121
} from "@/components/ui/breadcrumb";
2222
import { Separator } from "@/components/ui/separator";
23+
import { generateFormCode } from "@/components/form-builder/helpers/generate-react-code";
24+
import { Pre } from "@/components/ui/pre";
25+
import { Tabs, TabsList, TabsTrigger, TabsContent } from "@/components/ui/tabs";
2326

2427
const viewportEditorStyles = {
2528
sm: "w-[370px]",
@@ -48,13 +51,21 @@ export default function PreviewPage({
4851
const updateViewport = useFormBuilderStore((state) => state.updateViewport);
4952
const viewport = useFormBuilderStore((state) => state.viewport);
5053
const components = useFormBuilderStore((state) => state.components);
54+
const [formattedCode, setFormattedCode] = useState("");
5155
const { category, key } = use(params);
52-
5356
// Store the components types used in the form
5457
const componentsTypesUsedInForm = useMemo(() => {
5558
return components.map((component) => component.type);
5659
}, [components]);
5760

61+
useEffect(() => {
62+
const generateCode = async () => {
63+
const code = await generateFormCode(components);
64+
setFormattedCode(code.code);
65+
};
66+
generateCode();
67+
}, [components]);
68+
5869
useEffect(() => {
5970
const template = category;
6071
const templateKey = key;
@@ -95,41 +106,54 @@ export default function PreviewPage({
95106
</BreadcrumbList>
96107
</Breadcrumb>
97108
<main className="container max-w-7xl mx-auto flex flex-col md:flex-row gap-6 items-start mb-24 px-4">
98-
<div className="flex flex-col md:max-w-3/4 w-full gap-4">
99-
<div className="flex flex-col items-center border rounded-lg w-full">
100-
<div className="w-full border-b flex justify-between items-center p-2.5 px-4">
101-
<span className="text-slate text-muted-foreground">
102-
Form preview
103-
</span>
104-
<ToggleGroupNav
105-
name="viewport"
106-
items={viewportItems}
107-
defaultValue={viewport}
108-
onValueChange={(value) =>
109-
updateViewport(value as "sm" | "md" | "lg")
110-
}
111-
/>
112-
</div>
113-
<div className="bg-dotted p-10 w-full max-h-[700px] overflow-y-auto">
114-
<Card
115-
className={cn(
116-
"transition-all duration-300",
117-
`${viewportEditorStyles[viewport]}`,
118-
"mx-auto scrollbar-hide"
119-
)}
120-
>
121-
<CardContent>
122-
<GenerateCanvasGrid components={components} />
123-
</CardContent>
124-
</Card>
125-
</div>
126-
</div>
109+
<div className="flex flex-col md:max-w-3/4 w-full">
110+
<Tabs defaultValue="preview" className="">
111+
<TabsList>
112+
<TabsTrigger value="preview">Preview</TabsTrigger>
113+
<TabsTrigger value="code">Code</TabsTrigger>
114+
</TabsList>
115+
<TabsContent value="preview">
116+
<div className="bg-dotted w-full max-h-[700px] overflow-y-auto rounded-lg border px-4 pb-4 md:px-10 md:pb-10">
117+
<ToggleGroupNav
118+
name="viewport"
119+
items={viewportItems}
120+
defaultValue={viewport}
121+
onValueChange={(value) =>
122+
updateViewport(value as "sm" | "md" | "lg")
123+
}
124+
className="mx-auto my-4 shadow"
125+
/>
126+
<Card
127+
className={cn(
128+
"transition-all duration-300",
129+
`${viewportEditorStyles[viewport]}`,
130+
"mx-auto scrollbar-hide"
131+
)}
132+
>
133+
<CardContent>
134+
<GenerateCanvasGrid components={components} />
135+
</CardContent>
136+
</Card>
137+
</div>
138+
</TabsContent>
139+
<TabsContent value="code">
140+
<div className="p-0 w-full max-h-[700px] overflow-y-auto rounded-lg border">
141+
{components && components.length > 0 ? (
142+
<Pre
143+
language="tsx"
144+
code={formattedCode}
145+
className="rounded-none"
146+
/>
147+
) : null}
148+
</div>
149+
</TabsContent>
150+
</Tabs>
127151
</div>
128-
<div className="md:w-1/4 border rounded-lg p-4">
129-
<h1 className="text-2xl font-bold mb-2">{loadedTemplate?.formTitle}</h1>
130-
<p className="text-sm mb-2">
131-
Form description:
132-
</p>
152+
<div className="md:w-1/4 border rounded-lg p-4 md:mt-11">
153+
<h1 className="text-2xl font-bold mb-2">
154+
{loadedTemplate?.formTitle}
155+
</h1>
156+
<p className="text-sm mb-2">Form description:</p>
133157
<p className="text-sm text-muted-foreground mb-4">
134158
{loadedTemplate?.formDescription}
135159
</p>
@@ -165,7 +189,7 @@ export default function PreviewPage({
165189
</div>
166190
)}
167191
<Separator className="my-4" />
168-
<a
192+
<a
169193
href={`/builder?template=${category}&key=${key}`}
170194
className={cn(buttonVariants({ variant: "default" }), "w-full")}
171195
>

‎src/components/form-builder/dialogs/generate-code-dialog.tsx‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@ import { Button } from "@/components/ui/button";
44
import { Pre } from "@/components/ui/pre";
55
import { Copy, Check } from "lucide-react";
66
import { useEffect, useMemo, useState } from "react";
7-
import * as prettier from "prettier/standalone";
8-
import * as parserTypescript from "prettier/parser-typescript";
97
import { generateFormCode } from "../helpers/generate-react-code";
10-
import * as prettierPluginEstree from "prettier/plugins/estree";
118
import { useFormBuilderStore } from "@/stores/form-builder-store";
12-
import type { Plugin } from "prettier";
139
import { ReactCode } from "@/types/form-builder.types";
1410
import { DependenciesImports } from "../helpers/generate-react-code";
1511

@@ -49,25 +45,13 @@ export function MainExport() {
4945
generateCode();
5046
}, [components]);
5147

52-
const [formattedCode, setFormattedCode] = useState(generatedCode.code);
5348
const [copied, setCopied] = useState(false);
5449
const formTitle = useFormBuilderStore
5550
.getState()
5651
.formTitle.replace(/\s+/g, "");
5752

58-
useEffect(() => {
59-
prettier
60-
.format(generatedCode.code, {
61-
parser: "typescript",
62-
plugins: [parserTypescript, prettierPluginEstree as Plugin],
63-
semi: true,
64-
singleQuote: false,
65-
})
66-
.then(setFormattedCode);
67-
}, [generatedCode.code]);
68-
6953
const handleDownload = () => {
70-
const blob = new Blob([formattedCode], { type: "text/plain" });
54+
const blob = new Blob([generatedCode.code], { type: "text/plain" });
7155
const url = window.URL.createObjectURL(blob);
7256
const a = document.createElement("a");
7357
a.href = url;
@@ -165,7 +149,7 @@ export function MainExport() {
165149
variant="ghost"
166150
size="sm"
167151
className="absolute top-2 right-2 text-muted-foreground"
168-
onClick={() => handleCopy(formattedCode)}
152+
onClick={() => handleCopy(generatedCode.code)}
169153
>
170154
{copied ? (
171155
<Check className="h-4 w-4" />
@@ -176,7 +160,7 @@ export function MainExport() {
176160
</div>
177161

178162
<div className="flex-1 overflow-y-auto relative">
179-
<Pre language="typescript" code={formattedCode} className="" />
163+
<Pre language="typescript" code={generatedCode.code} className="" />
180164
</div>
181165

182166
<div className="relative">

‎src/components/form-builder/helpers/generate-react-code.tsx‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import { getComponentReactCode } from "@/config/available-components";
33
import { cn, generateTWClassesForAllViewports } from "@/lib/utils";
44
import { useFormBuilderStore } from "@/stores/form-builder-store";
55
import { getZodDefaultValuesAsString, getZodSchemaForComponents } from "./zod";
6+
import * as prettier from "prettier/standalone";
7+
import * as parserTypescript from "prettier/parser-typescript";
8+
import * as prettierPluginEstree from "prettier/plugins/estree";
9+
import { Plugin } from "prettier";
610

711
export type DependenciesImports = Record<string, string[] | string>;
812

@@ -198,7 +202,16 @@ ${formCode}
198202
);
199203
}`;
200204

201-
return { code, dependenciesImports, thirdPartyDependenciesImports };
205+
206+
const formattedCode = await prettier.format(code, {
207+
parser: "typescript",
208+
plugins: [parserTypescript, prettierPluginEstree as Plugin],
209+
semi: true,
210+
singleQuote: false,
211+
})
212+
213+
214+
return { code: formattedCode, dependenciesImports, thirdPartyDependenciesImports };
202215
};
203216

204217
export { generateFormCode };

0 commit comments

Comments
 (0)