Skip to content

Commit 956f479

Browse files
committed
Merge branch 'development'
2 parents 028f332 + 516e514 commit 956f479

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1350
-2211
lines changed

package-lock.json

Lines changed: 19 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
"clsx": "^2.1.1",
3030
"connectkit": "^1.8.2",
3131
"date-fns": "^4.1.0",
32+
"dexie": "^4.0.11",
33+
"dexie-react-hooks": "^1.1.7",
3234
"framer-motion": "^12.16.0",
3335
"lodash": "^4.17.21",
3436
"react": "^18.2.0",

src/components/account/Overview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function Overview() {
2121
return (
2222
<div className="w-full flex-1">
2323
<div className="grid w-full grid-cols-3 gap-5">
24-
<CardWithHeader icon={<RiMoneyDollarCircleLine />} title="Balance">
24+
<CardWithHeader icon={<RiMoneyDollarCircleLine className="-m-[1px] text-[20px]" />} title="Balance">
2525
<div className="col h-full w-full gap-4">
2626
<ValueWithLabel label="Amount in wallet" value={fBI(usdcBalance, 6)} prefix="$USDC" />
2727

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import { COLOR_TYPES } from '@data/colorTypes';
2+
import { SelectItem } from '@heroui/select';
3+
import Label from '@shared/Label';
4+
import StyledSelect from '@shared/StyledSelect';
5+
import { Controller, useFormContext } from 'react-hook-form';
6+
7+
export default function ColorSelect() {
8+
const { control } = useFormContext();
9+
10+
return (
11+
<div className="col w-full gap-2">
12+
<Label value="Color" />
13+
14+
<Controller
15+
name="color"
16+
control={control}
17+
render={({ field, fieldState }) => (
18+
<StyledSelect
19+
items={COLOR_TYPES}
20+
selectedKeys={field.value ? [field.value] : []}
21+
onSelectionChange={(keys) => {
22+
const selectedKey = Array.from(keys)[0] as string;
23+
field.onChange(selectedKey);
24+
}}
25+
onBlur={field.onBlur}
26+
isInvalid={!!fieldState.error}
27+
errorMessage={fieldState.error?.message}
28+
placeholder="Select a color"
29+
renderValue={(items) => {
30+
return items.map((item) => (
31+
<ColorOption
32+
key={item.key}
33+
colorHex={String(item.key as string)}
34+
colorName={String(item.textValue as string)}
35+
/>
36+
));
37+
}}
38+
>
39+
{COLOR_TYPES.map((color) => (
40+
<SelectItem key={color.hex} textValue={color.name}>
41+
<ColorOption colorHex={color.hex} colorName={color.name} />
42+
</SelectItem>
43+
))}
44+
</StyledSelect>
45+
)}
46+
/>
47+
</div>
48+
);
49+
}
50+
51+
function ColorOption({ colorHex, colorName }: { colorHex: string; colorName: string }) {
52+
return (
53+
<div className="row gap-2 py-1">
54+
<div className="mt-[1px] h-2.5 w-2.5 rounded-full" style={{ backgroundColor: colorHex }}></div>
55+
<div className="font-medium">{colorName}</div>
56+
</div>
57+
);
58+
}
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
import { SlateCard } from '@shared/cards/SlateCard';
2+
import InputWithLabel from '@shared/InputWithLabel';
3+
import SubmitButton from '@shared/SubmitButton';
4+
import SupportFooter from '@shared/SupportFooter';
5+
import { RiBox3Line } from 'react-icons/ri';
6+
import ColorSelect from './ColorSelect';
7+
8+
function ProjectForm() {
9+
return (
10+
<div className="col gap-12">
11+
<div className="col items-center gap-8">
12+
<div className="col items-center gap-4">
13+
<div className="flex">
14+
<div className="rounded-full bg-primary p-2.5 text-2xl text-white">
15+
<RiBox3Line />
16+
</div>
17+
</div>
18+
19+
<div className="col gap-1.5 text-center">
20+
<div className="big-title">New Project</div>
21+
22+
<div className="max-w-[260px] text-[15px] text-slate-500">
23+
Deploy a project with multiple jobs across the decentralized edge
24+
</div>
25+
</div>
26+
</div>
27+
28+
<div className="col w-full gap-4">
29+
<SlateCard>
30+
<div className="col gap-4">
31+
<InputWithLabel name="name" label="Name" placeholder="Project" />
32+
<ColorSelect />
33+
</div>
34+
</SlateCard>
35+
</div>
36+
37+
<SubmitButton label="Create Project" />
38+
</div>
39+
40+
<SupportFooter />
41+
</div>
42+
);
43+
}
44+
45+
export default ProjectForm;

src/components/deeploy-app/DeeployWrapper.tsx

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

src/components/deeploy-app/Stepper.tsx

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

src/components/deeploy-app/steps/FormTypeSelect.tsx

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

0 commit comments

Comments
 (0)