-
Notifications
You must be signed in to change notification settings - Fork 198
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into illiar/feat/collection-flow-customization
- Loading branch information
Showing
195 changed files
with
5,203 additions
and
1,509 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
[submodule "data-migrations"] | ||
path = services/workflows-service/prisma/data-migrations | ||
url = git@github.com:ballerine-io/wf-data-migration.git | ||
branch = dev | ||
ignore = dirty | ||
branch = main | ||
ignore = dirty |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,5 @@ | ||
{} | ||
{ | ||
"home": { | ||
"greeting": "Welcome" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
apps/backoffice-v2/src/common/components/molecules/DateRangePicker/DateRangePicker.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
import React, { ComponentProps } from 'react'; | ||
import { CalendarIcon } from '@radix-ui/react-icons'; | ||
import { formatDate } from '@/common/utils/format-date'; | ||
import { ctw } from '@/common/utils/ctw/ctw'; | ||
import { Button } from '../../atoms/Button/Button'; | ||
import { Calendar } from '../../organisms/Calendar/Calendar'; | ||
import { Popover, PopoverContent, PopoverTrigger } from '@ballerine/ui'; | ||
|
||
type TDateRangePickerProps = { | ||
onChange: NonNullable<ComponentProps<typeof Calendar>['onSelect']>; | ||
value: NonNullable<ComponentProps<typeof Calendar>['selected']>; | ||
className?: ComponentProps<'div'>['className']; | ||
}; | ||
|
||
export const DateRangePicker = ({ onChange, value, className }: TDateRangePickerProps) => { | ||
return ( | ||
<div className={ctw('grid gap-2', className)}> | ||
<Popover> | ||
<PopoverTrigger asChild> | ||
<Button | ||
id="date" | ||
variant={'outline'} | ||
className={ctw('w-[300px] justify-start text-left font-normal', { | ||
'text-muted-foreground': !value, | ||
})} | ||
> | ||
<CalendarIcon className="size-4 mr-2" /> | ||
{value?.from && value?.to && ( | ||
<> | ||
{formatDate(value.from, 'LLL dd, y')} - {formatDate(value.to, 'LLL dd, y')} | ||
</> | ||
)} | ||
{value?.from && !value?.to && formatDate(value.from, 'LLL dd, y')} | ||
{!value?.from && !value?.to && <span>Pick a date</span>} | ||
</Button> | ||
</PopoverTrigger> | ||
<PopoverContent className="w-auto p-0" align="start"> | ||
<Calendar | ||
initialFocus | ||
mode="range" | ||
selected={value} | ||
onSelect={onChange} | ||
numberOfMonths={2} | ||
/> | ||
</PopoverContent> | ||
</Popover> | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.