Skip to content

Commit 8abc916

Browse files
committed
merge with main
2 parents 5aad4b6 + f4129b9 commit 8abc916

36 files changed

Lines changed: 1510 additions & 351 deletions

.changeset/great-cycles-fold.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"flowtestai": minor
3+
---
4+
5+
A more intuitive UX to onboard first time user

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"notistack": "^3.0.1",
6161
"postcss": "^8.4.35",
6262
"react": "^18.2.0",
63+
"react-custom-scrollbars": "^4.2.1",
6364
"react-dom": "^18.2.0",
6465
"react-edit-text": "^5.1.1",
6566
"react-icons": "^5.0.1",

pnpm-lock.yaml

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/atoms/Editor.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/components/atoms/Editor.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { indentWithTab, history } from '@codemirror/commands';
77
import { json } from '@codemirror/lang-json';
88
import { defaultKeymap } from '@codemirror/commands';
99
import { syntaxHighlighting, defaultHighlightStyle } from '@codemirror/language';
10-
import 'components/atoms/Editor.css';
1110

1211
export const Editor = ({ ...props }) => {
1312
const editor = useRef();

src/components/atoms/common/Button.js

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,6 @@ const Button = ({
1313
onlyIcon,
1414
padding,
1515
}) => {
16-
// const btnColorStyles = {
17-
// primary: {
18-
// default: 'border-denim-600 bg-denim-600 text-white hover:bg-denim-700', // with bg color
19-
// intent: {
20-
// info: 'border-sky-600 bg-sky-600 text-white hover:bg-sky-700',
21-
// success: 'border-green-600 bg-green-600 text-white hover:bg-green-700',
22-
// warning: 'border-amber-600 bg-amber-600 text-white hover:bg-amber-700',
23-
// error: 'border-red-600 bg-red-600 text-white hover:bg-red-700',
24-
// },
25-
// },
26-
// secondary: {
27-
// default: 'border border-denim-600 bg-denim-50 text-denim-600 hover:bg-denim-100', // outline
28-
// intent: {
29-
// info: 'border border-sky-600 bg-sky-50 text-sky-600 hover:bg-sky-100',
30-
// success: 'border border-green-600 bg-green-50 text-green-600 hover:bg-green-100',
31-
// warning: 'border border-amber-600 bg-amber-50 text-amber-600 hover:bg-amber-100',
32-
// error: 'border border-red-600 bg-red-50 text-red-600 hover:bg-red-100',
33-
// },
34-
// },
35-
// tertiary: {
36-
// default: 'text-denim-600 hover:bg-denim-100', // without border
37-
// intent: {
38-
// info: 'text-sky-600 hover:bg-sky-100',
39-
// success: 'text-green-600 hover:bg-green-100',
40-
// warning: 'text-amber-600 hover:bg-amber-100',
41-
// error: 'text-red-600 hover:bg-red-100',
42-
// },
43-
// },
44-
// minimal: {
45-
// default: 'text-fog-600 hover:text-fog-900 hover:font-semibold hover:bg-fog-50',
46-
// intent: {
47-
// info: 'text-sky-600 hover:text-sky-900 hover:font-semibold',
48-
// success: 'text-green-600 hover:text-green-900 hover:font-semibold',
49-
// warning: 'text-amber-600 hover:text-amber-900 hover:font-semibold',
50-
// error: 'text-red-600 hover:text-red-900 hover:font-semibold',
51-
// },
52-
// },
53-
// disabled: {
54-
// default: 'text-fog-600 hover:text-fog-900 hover:font-semibold hover:bg-fog-50 cursor-not-allowed',
55-
// },
56-
// };
57-
5816
const btnColorStyles = {
5917
primary: {
6018
default: 'border-cyan-900 text-white bg-cyan-900 hover:border-cyan-950 hover:bg-cyan-950', // with bg color
@@ -93,7 +51,7 @@ const Button = ({
9351
},
9452
},
9553
disabled: {
96-
default: 'text-gray-300 hover:font-semibold cursor-not-allowed',
54+
default: 'text-gray-300 border border-gray-300 cursor-not-allowed',
9755
},
9856
};
9957

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
import React from 'react';
22

3-
const HorizontalDivider = () => {
4-
return <div className='h-[1px] w-full bg-gray-300'></div>;
3+
const HorizontalDivider = ({ themeColor, themeStyles }) => {
4+
return (
5+
<div
6+
className={`h-[1px] w-full ${themeColor ? themeColor : 'bg-gray-300'} ${themeStyles ? themeStyles : ''}`}
7+
></div>
8+
);
59
};
610

711
export default HorizontalDivider;

src/components/atoms/common/TextInput.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
import React from 'react';
22

3-
const TextInput = ({ id, placeHolder, onChangeHandler, name, value }) => {
3+
const TextInput = ({ id, placeHolder, onChangeHandler, name, value, disableState }) => {
4+
const mainStyles =
5+
'nodrag nowheel block w-full rounded border border-slate-700 bg-background-light p-2.5 text-sm outline-none';
6+
const intentStyles = disableState ? 'cursor-not-allowed text-slate-400' : 'text-slate-900';
47
return (
58
<input
69
id={id}
710
type='text'
811
placeholder={placeHolder}
9-
className='nodrag nowheel bg-background-light block w-full rounded border border-slate-700 p-2.5 text-sm text-slate-900 outline-none'
12+
className={`${mainStyles} ${intentStyles}`}
1013
name={name}
1114
onChange={onChangeHandler}
1215
value={value}
16+
disabled={disableState}
1317
/>
1418
);
1519
};

src/components/atoms/common/TimeoutSelector.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const TimeoutSelector = ({ optionsData, onSelectHandler = () => null }) => {
2727
>
2828
<div className='relative flex h-full'>
2929
<Listbox.Button
30-
className={`flex items-center justify-between sm:text-sm ${optionsData.length ? 'cursor-default' : 'cursor-not-allowed'}`}
30+
className={`flex items-center justify-between gap-1 sm:text-sm ${optionsData.length ? 'cursor-default' : 'cursor-not-allowed'}`}
3131
>
3232
<ClockIcon className='w-5 h-5' />
3333
<div className='min-w-24'>{selected ? selected : 'Select Timeout'}</div>

src/components/atoms/flow/Textarea.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import React from 'react';
22

3-
const Textarea = ({ placeHolder, onChangeHandler, name, value, rows }) => {
3+
const Textarea = ({ id, placeHolder, onChangeHandler, name, value, rows }) => {
44
return (
55
<textarea
6+
id={id}
67
placeholder={placeHolder}
7-
className='nodrag nowheel bg-background-light min-h-12 w-full min-w-72 resize rounded border border-slate-700 p-2.5 text-sm text-slate-900 outline-none'
8+
className='nodrag nowheel min-h-12 w-full min-w-72 resize rounded border border-slate-700 bg-background-light p-2.5 text-sm text-slate-900 outline-none'
89
name={name}
910
onChange={onChangeHandler}
1011
rows={rows}

0 commit comments

Comments
 (0)