jyapayne/langflow
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Convert Tailwind CSS Classes to Constants for Improved Code Readability and Reusability (#584)

Browse source
This commit is contained in:
Gabriel Luiz Freitas Almeida 2023-07-03 09:35:40 -03:00 • committed by GitHub
commit f461670df8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 116 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/frontend/src/components/chatComponent/chatMessage/index.tsx
View file

@ -28,7 +28,7 @@ export default function ChatMessage({ chat }: { chat: ChatMessageType }) {
<div <div
onClick={() => setHidden((prev) => !prev)} onClick={() => setHidden((prev) => !prev)}
style={{ backgroundColor: nodeColors["thought"] }} style={{ backgroundColor: nodeColors["thought"] }}
className="inline-block w-full cursor-pointer px-5 pb-3 pt-3 text-start" className=" inline-block w-full cursor-pointer px-5 pb-3 pt-3 text-start"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: DOMPurify.sanitize(convert.toHtml(chat.thought)), __html: DOMPurify.sanitize(convert.toHtml(chat.thought)),
}} }}

14
src/frontend/src/components/codeAreaComponent/index.tsx
View file

@ -3,7 +3,12 @@ import { PopUpContext } from "../../contexts/popUpContext";
import CodeAreaModal from "../../modals/codeAreaModal"; import CodeAreaModal from "../../modals/codeAreaModal";
import TextAreaModal from "../../modals/textAreaModal"; import TextAreaModal from "../../modals/textAreaModal";
import { TextAreaComponentType } from "../../types/components"; import { TextAreaComponentType } from "../../types/components";
import { INPUT_STYLE } from "../../constants"; import {
INPUT_DIALOG,
INPUT_DISABLE,
INPUT_EDIT_NODE,
INPUT_STYLE,
} from "../../constants";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
export default function CodeAreaComponent({ export default function CodeAreaComponent({
@ -48,11 +53,8 @@ export default function CodeAreaComponent({
}} }}
className={ className={
editNode editNode
? "form-input block w-full cursor-pointer truncate rounded-md border border-ring bg-transparent pb-0.5 pt-0.5 text-sm text-ring shadow-sm placeholder:text-center sm:text-sm" + ? INPUT_EDIT_NODE + INPUT_DIALOG
INPUT_STYLE : INPUT_STYLE + INPUT_DIALOG + (disabled ? INPUT_DISABLE : "")
: "block w-full truncate rounded-md border border-ring px-3 py-2 text-ring shadow-sm placeholder:text-muted-foreground sm:text-sm" +
INPUT_STYLE +
(disabled ? " bg-input" : "")
} }
> >
{myValue !== "" ? myValue : "Type something..."} {myValue !== "" ? myValue : "Type something..."}

8
src/frontend/src/components/dropdownComponent/index.tsx
View file

@ -2,7 +2,7 @@ import { Listbox, Transition } from "@headlessui/react";
import { Fragment, useContext, useEffect, useState } from "react"; import { Fragment, useContext, useEffect, useState } from "react";
import { DropDownComponentType } from "../../types/components"; import { DropDownComponentType } from "../../types/components";
import { classNames } from "../../utils"; import { classNames } from "../../utils";
import { INPUT_STYLE } from "../../constants"; import { INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
import { ChevronsUpDown, Check } from "lucide-react"; import { ChevronsUpDown, Check } from "lucide-react";
import { PopUpContext } from "../../contexts/popUpContext"; import { PopUpContext } from "../../contexts/popUpContext";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
@ -40,10 +40,8 @@ export default function Dropdown({
<Listbox.Button <Listbox.Button
className={ className={
editNode editNode
? "form-input relative block w-full rounded-md border pb-0.5 pr-8 pt-0.5 shadow-sm placeholder:text-center sm:text-sm" + ? "border-1 relative pr-8" + INPUT_EDIT_NODE
INPUT_STYLE : "py-2 pl-3 pr-10 text-left" + INPUT_STYLE
: "w-full rounded-md border py-2 pl-3 pr-10 text-left shadow-sm placeholder:text-muted-foreground focus-visible:outline-none sm:text-sm" +
INPUT_STYLE
} }
> >
<span className="block w-full truncate bg-background"> <span className="block w-full truncate bg-background">

9
src/frontend/src/components/floatComponent/index.tsx
View file

@ -1,7 +1,7 @@
import { useContext, useEffect, useState } from "react"; import { useContext, useEffect, useState } from "react";
import { FloatComponentType } from "../../types/components"; import { FloatComponentType } from "../../types/components";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import { INPUT_STYLE } from "../../constants"; import { INPUT_DISABLE, INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
import { PopUpContext } from "../../contexts/popUpContext"; import { PopUpContext } from "../../contexts/popUpContext";
export default function FloatComponent({ export default function FloatComponent({
@ -58,11 +58,8 @@ export default function FloatComponent({
value={myValue} value={myValue}
className={ className={
editNode editNode
? "form-input block w-full rounded-md border border-border pb-0.5 pt-0.5 text-center shadow-sm placeholder:text-center placeholder:text-muted-foreground focus:placeholder-transparent sm:text-sm" + ? INPUT_EDIT_NODE
INPUT_STYLE : INPUT_STYLE + (disabled ? INPUT_DISABLE : "")
: "form-input block w-full rounded-md border-border bg-background shadow-sm ring-offset-input placeholder:text-muted-foreground focus:placeholder-transparent sm:text-sm" +
INPUT_STYLE +
(disabled ? " bg-input" : "")
} }
placeholder={ placeholder={
editNode ? "Number 0 to 1" : "Type a number from zero to one" editNode ? "Number 0 to 1" : "Type a number from zero to one"

11
src/frontend/src/components/inputComponent/index.tsx
View file

@ -3,7 +3,7 @@ import { InputComponentType } from "../../types/components";
import { classNames } from "../../utils"; import { classNames } from "../../utils";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import { PopUpContext } from "../../contexts/popUpContext"; import { PopUpContext } from "../../contexts/popUpContext";
import { INPUT_STYLE } from "../../constants"; import { INPUT_DISABLE, INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
export default function InputComponent({ export default function InputComponent({
value, value,
@ -46,13 +46,10 @@ export default function InputComponent({
if (disableCopyPaste) setDisableCopyPaste(false); if (disableCopyPaste) setDisableCopyPaste(false);
}} }}
className={classNames( className={classNames(
"form-input block w-full rounded-md border-ring bg-background pr-12 shadow-sm placeholder:text-muted-foreground focus:placeholder-transparent sm:text-sm", " pr-12 ",
disabled ? " bg-input" : "", disabled ? INPUT_DISABLE : "",
password && !pwdVisible && myValue !== "" ? "password" : "", password && !pwdVisible && myValue !== "" ? "password" : "",
editNode editNode ? INPUT_EDIT_NODE : INPUT_STYLE,
? "form-input block w-full rounded-md border border-ring pb-0.5 pt-0.5 text-center shadow-sm sm:text-sm" +
INPUT_STYLE
: "ring-offset-input" + INPUT_STYLE,
password && editNode ? "pr-8" : "pr-3" password && editNode ? "pr-8" : "pr-3"
)} )}
placeholder={password && editNode ? "Key" : "Type something..."} placeholder={password && editNode ? "Key" : "Type something..."}

9
src/frontend/src/components/inputFileComponent/index.tsx
View file

@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from "react";
import { alertContext } from "../../contexts/alertContext"; import { alertContext } from "../../contexts/alertContext";
import { FileComponentType } from "../../types/components"; import { FileComponentType } from "../../types/components";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import { INPUT_STYLE } from "../../constants"; import { INPUT_DISABLE, INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
import { FileSearch2 } from "lucide-react"; import { FileSearch2 } from "lucide-react";
import { uploadFile } from "../../controllers/API"; import { uploadFile } from "../../controllers/API";
@ -103,11 +103,8 @@ export default function InputFileComponent({
onClick={handleButtonClick} onClick={handleButtonClick}
className={ className={
editNode editNode
? "form-input block w-full truncate rounded-md border border-ring pb-0.5 pt-0.5 text-ring shadow-sm placeholder:text-center sm:text-sm" + ? INPUT_EDIT_NODE + INPUT_STYLE
INPUT_STYLE : INPUT_STYLE + (disabled ? INPUT_DISABLE : "")
: "block w-full truncate rounded-md border border-ring px-3 py-2 text-ring shadow-sm sm:text-sm" +
INPUT_STYLE +
(disabled ? " bg-input" : "")
} }
> >
{myValue !== "" ? myValue : "No file"} {myValue !== "" ? myValue : "No file"}

95
src/frontend/src/components/inputListComponent/index.tsx
View file

@ -3,7 +3,7 @@ import { InputListComponentType } from "../../types/components";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import _ from "lodash"; import _ from "lodash";
import { INPUT_STYLE } from "../../constants"; import { INPUT_DISABLE, INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
import { X, Plus } from "lucide-react"; import { X, Plus } from "lucide-react";
import { PopUpContext } from "../../contexts/popUpContext"; import { PopUpContext } from "../../contexts/popUpContext";
@ -35,60 +35,57 @@ export default function InputListComponent({
"flex flex-col gap-3 py-2" "flex flex-col gap-3 py-2"
} }
> >
{inputList.map((i, idx) => ( {inputList.map((i, idx) => {
<div key={idx} className="flex w-full gap-3"> return (
<input <div key={idx} className="flex w-full gap-3">
type="text" <input
value={i} type="text"
className={ value={i}
editNode className={
? "form-input block w-full cursor-pointer truncate rounded-md border-[1px] border-ring pb-0.5 pt-0.5 text-center text-ring shadow-sm placeholder:text-center sm:text-sm" + editNode
INPUT_STYLE ? INPUT_EDIT_NODE
: "form-input block w-full rounded-md border-ring bg-background shadow-sm focus:border-ring focus:ring-ring sm:text-sm" + : INPUT_STYLE + (disabled ? INPUT_DISABLE : "")
(disabled ? " bg-input" : "") + }
"focus:placeholder-transparent" placeholder="Type something..."
} onChange={(e) => {
placeholder="Type something..."
onChange={(e) => {
setInputList((old) => {
let newInputList = _.cloneDeep(old);
newInputList[idx] = e.target.value;
onChange(newInputList);
return newInputList;
});
}}
/>
{idx === inputList.length - 1 ? (
<button
onClick={() => {
setInputList((old) => { setInputList((old) => {
let newInputList = _.cloneDeep(old); let newInputList = _.cloneDeep(old);
newInputList.push(""); newInputList[idx] = e.target.value;
onAddInput(newInputList);
return newInputList; return newInputList;
}); });
onChange(inputList); onChange(inputList);
}} }}
> />
<Plus className={"h-4 w-4 hover:text-ring"} /> {idx === inputList.length - 1 ? (
</button> <button
) : ( onClick={() => {
<button setInputList((old) => {
onClick={() => { let newInputList = _.cloneDeep(old);
setInputList((old) => { newInputList.push("");
let newInputList = _.cloneDeep(old); return newInputList;
newInputList.splice(idx, 1); });
onAddInput(newInputList); onChange(inputList);
return newInputList; }}
}); >
onChange(inputList); <Plus className={"h-4 w-4 hover:text-ring"} />
}} </button>
> ) : (
<X className="h-4 w-4 hover:text-status-red" /> <button
</button> onClick={() => {
)} setInputList((old) => {
</div> let newInputList = _.cloneDeep(old);
))} newInputList.splice(idx, 1);
return newInputList;
});
onChange(inputList);
}}
>
<X className="h-4 w-4 hover:text-status-red" />
</button>
)}
</div>
);
})}
</div> </div>
); );
} }

9
src/frontend/src/components/intComponent/index.tsx
View file

@ -2,7 +2,7 @@ import { useContext, useEffect, useState } from "react";
import { FloatComponentType } from "../../types/components"; import { FloatComponentType } from "../../types/components";
import { TabsContext } from "../../contexts/tabsContext"; import { TabsContext } from "../../contexts/tabsContext";
import { classNames } from "../../utils"; import { classNames } from "../../utils";
import { INPUT_STYLE } from "../../constants"; import { INPUT_DISABLE, INPUT_EDIT_NODE, INPUT_STYLE } from "../../constants";
import { PopUpContext } from "../../contexts/popUpContext"; import { PopUpContext } from "../../contexts/popUpContext";
export default function IntComponent({ export default function IntComponent({
@ -72,11 +72,8 @@ export default function IntComponent({
value={myValue} value={myValue}
className={ className={
editNode editNode
? "form-input block w-full rounded-md border pb-0.5 pt-0.5 text-center shadow-sm placeholder:text-center placeholder:text-muted-foreground focus:placeholder-transparent sm:text-sm" + ? INPUT_EDIT_NODE
INPUT_STYLE : INPUT_STYLE + (disabled ? INPUT_DISABLE : "")
: "form-input block w-full rounded-md bg-background shadow-sm ring-offset-background placeholder:text-muted-foreground focus:placeholder-transparent sm:text-sm" +
INPUT_STYLE +
(disabled ? " bg-input" : "")
} }
placeholder={editNode ? "Integer number" : "Type an integer number"} placeholder={editNode ? "Integer number" : "Type an integer number"}
onChange={(e) => { onChange={(e) => {

13
src/frontend/src/components/promptComponent/index.tsx
View file

@ -3,7 +3,12 @@ import { PopUpContext } from "../../contexts/popUpContext";
import { TextAreaComponentType } from "../../types/components"; import { TextAreaComponentType } from "../../types/components";
import GenericModal from "../../modals/genericModal"; import GenericModal from "../../modals/genericModal";
import { TypeModal } from "../../utils"; import { TypeModal } from "../../utils";
import { INPUT_STYLE } from "../../constants"; import {
INPUT_DIALOG,
INPUT_DISABLE,
INPUT_EDIT_NODE,
INPUT_STYLE,
} from "../../constants";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
export default function PromptAreaComponent({ export default function PromptAreaComponent({
@ -49,10 +54,8 @@ export default function PromptAreaComponent({
}} }}
className={ className={
editNode editNode
? "form-input block w-full cursor-pointer truncate rounded-md border border-ring pb-0.5 pt-0.5 text-ring shadow-sm placeholder:text-center sm:text-sm" + ? INPUT_EDIT_NODE + INPUT_DIALOG
INPUT_STYLE : (disabled ? INPUT_DISABLE : "") + INPUT_STYLE + INPUT_DIALOG
: "block w-full truncate rounded-md border border-ring px-3 py-2 text-ring shadow-sm sm:text-sm" +
(disabled ? " bg-input" : "")
} }
> >
{myValue !== "" ? myValue : "Type your prompt here"} {myValue !== "" ? myValue : "Type your prompt here"}

13
src/frontend/src/components/textAreaComponent/index.tsx
View file

@ -3,7 +3,12 @@ import { PopUpContext } from "../../contexts/popUpContext";
import { TextAreaComponentType } from "../../types/components"; import { TextAreaComponentType } from "../../types/components";
import GenericModal from "../../modals/genericModal"; import GenericModal from "../../modals/genericModal";
import { TypeModal } from "../../utils"; import { TypeModal } from "../../utils";
import { INPUT_STYLE } from "../../constants"; import {
INPUT_DIALOG,
INPUT_DISABLE,
INPUT_EDIT_NODE,
INPUT_STYLE,
} from "../../constants";
import { ExternalLink } from "lucide-react"; import { ExternalLink } from "lucide-react";
export default function TextAreaComponent({ export default function TextAreaComponent({
@ -52,10 +57,8 @@ export default function TextAreaComponent({
}} }}
className={ className={
editNode editNode
? "form-input block w-full cursor-pointer truncate rounded-md border border-ring bg-transparent pb-0.5 pt-0.5 text-ring shadow-sm placeholder:text-center sm:text-sm" + ? INPUT_EDIT_NODE + INPUT_DIALOG
INPUT_STYLE : INPUT_DIALOG + "px-3 py-2" + (disabled ? INPUT_DISABLE : "")
: "block w-full truncate rounded-md border border-ring px-3 py-2 text-ring shadow-sm sm:text-sm" +
(disabled ? " bg-input" : "")
} }
> >
{myValue !== "" ? myValue : "Type something..."} {myValue !== "" ? myValue : "Type something..."}

28
src/frontend/src/constants.tsx
View file

@ -167,12 +167,36 @@ export const EXPORT_CODE_DIALOG =
"Generate the code to integrate your flow into an external application."; "Generate the code to integrate your flow into an external application.";
/** /**
* The base text for subtitle of code dialog * The base input for clickable ones
* @constant
*/
export const INPUT_DIALOG = " text-ring cursor-pointer bg-transparent";
/**
* The base input style
* @constant * @constant
*/ */
export const INPUT_STYLE = export const INPUT_STYLE =
" focus:tw-ring-none border-border focus-visible:outline-none focus:ring-ring focus:ring-1 bg-background focus:outline-none"; " bg-background block border-ring focus:placeholder-transparent focus:ring-ring focus:tw-ring-none form-input px-3 placeholder:text-muted-foreground rounded-md shadow-sm sm:text-sm truncate w-full ";
/**
* The base input on edit node
* @constant
*/
export const INPUT_EDIT_NODE =
" placeholder:text-center pt-0.5 pb-0.5 text-center " + INPUT_STYLE;
/**
* The base search input style
* @constant
*/
export const INPUT_SEARCH = INPUT_STYLE + " pr-7 mx-2 ";
/**
* The base disable input style
* @constant
*/
export const INPUT_DISABLE = " bg-input ";
/** /**
* The base text for subtitle of code dialog * The base text for subtitle of code dialog
* @constant * @constant

9
src/frontend/src/pages/FlowPage/components/extraSidebarComponent/index.tsx
View file

@ -15,7 +15,7 @@ import ExportModal from "../../../../modals/exportModal";
import ApiModal from "../../../../modals/ApiModal"; import ApiModal from "../../../../modals/ApiModal";
import { TabsContext } from "../../../../contexts/tabsContext"; import { TabsContext } from "../../../../contexts/tabsContext";
import { alertContext } from "../../../../contexts/alertContext"; import { alertContext } from "../../../../contexts/alertContext";
import { INPUT_STYLE } from "../../../../constants"; import { INPUT_SEARCH, INPUT_STYLE } from "../../../../constants";
import { Separator } from "../../../../components/ui/separator"; import { Separator } from "../../../../components/ui/separator";
import { Menu } from "lucide-react"; import { Menu } from "lucide-react";
@ -124,10 +124,7 @@ export default function ExtraSidebar() {
name="search" name="search"
id="search" id="search"
placeholder="Search" placeholder="Search"
className={ className={INPUT_SEARCH}
INPUT_STYLE +
"w-full rounded-md border border border-input bg-transparent px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50"
}
onChange={(e) => { onChange={(e) => {
handleSearchInput(e.target.value); handleSearchInput(e.target.value);
setSearch(e.target.value); setSearch(e.target.value);
@ -183,7 +180,7 @@ export default function ExtraSidebar() {
); );
}} }}
> >
<div className="flex w-full items-center justify-between rounded-md rounded-l-none border border-l-0 border-dashed border-ring bg-background px-3 py-1 text-sm"> <div className="flex w-full items-center justify-between rounded-md rounded-l-none border border-l-0 border-dashed border-ring bg-white px-3 py-1 text-sm">
<span className="w-full truncate pr-1 text-xs text-foreground"> <span className="w-full truncate pr-1 text-xs text-foreground">
{data[d][t].display_name} {data[d][t].display_name}
</span> </span>