- 일정 시간 picker ui 수정(적용/취소 추가)
This commit is contained in:
@@ -60,13 +60,13 @@ export const TimePickPopover = ({ ...props }: TimePickPopoverProps) => {
|
|||||||
>
|
>
|
||||||
<ToggleGroupItem
|
<ToggleGroupItem
|
||||||
value={"오전"}
|
value={"오전"}
|
||||||
className="w-full h-7"
|
className="w-full h-7 rounded-none! rounded-tl-md!"
|
||||||
>
|
>
|
||||||
오전
|
오전
|
||||||
</ToggleGroupItem>
|
</ToggleGroupItem>
|
||||||
<ToggleGroupItem
|
<ToggleGroupItem
|
||||||
value={"오후"}
|
value={"오후"}
|
||||||
className="w-full h-7"
|
className="w-full h-7 rounded-none!"
|
||||||
>
|
>
|
||||||
오후
|
오후
|
||||||
</ToggleGroupItem>
|
</ToggleGroupItem>
|
||||||
@@ -81,7 +81,7 @@ export const TimePickPopover = ({ ...props }: TimePickPopoverProps) => {
|
|||||||
{
|
{
|
||||||
[1,2,3,4,5,6,7,8,9,10,11,12].map((time) => (
|
[1,2,3,4,5,6,7,8,9,10,11,12].map((time) => (
|
||||||
<ToggleGroupItem
|
<ToggleGroupItem
|
||||||
className="w-full h-7 rounded-none"
|
className="w-full h-7 rounded-none!"
|
||||||
value={time.toString().padStart(2, '0')}
|
value={time.toString().padStart(2, '0')}
|
||||||
>
|
>
|
||||||
{time.toString().padStart(2, '0')}
|
{time.toString().padStart(2, '0')}
|
||||||
@@ -95,20 +95,32 @@ export const TimePickPopover = ({ ...props }: TimePickPopoverProps) => {
|
|||||||
>
|
>
|
||||||
<ToggleGroup
|
<ToggleGroup
|
||||||
type="single"
|
type="single"
|
||||||
className="w-full h-full flex flex-col justify-start items-center"
|
className="w-full h-full rounded-none border-r flex flex-col justify-start items-center"
|
||||||
>
|
>
|
||||||
{
|
{
|
||||||
Array.from({ length: 60 }).map((_, idx) => (
|
Array.from({ length: 60 }).map((_, idx) => (
|
||||||
<ToggleGroupItem
|
<ToggleGroupItem
|
||||||
value={idx.toString().padStart(2, '0')}
|
value={idx.toString().padStart(2, '0')}
|
||||||
className="w-full h-7"
|
className="w-full h-7 rounded-none!"
|
||||||
>
|
>
|
||||||
{idx.toString().padStart(0, '2')}
|
{idx.toString().padStart(2, '0')}
|
||||||
</ToggleGroupItem>
|
</ToggleGroupItem>
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
</ToggleGroup>
|
</ToggleGroup>
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
|
<div className="w-15 h-full flex flex-col">
|
||||||
|
<div
|
||||||
|
className="cursor-default text-sm flex justify-center items-center w-full h-7 rounded-none rounded-tr-md! hover:bg-gray-100"
|
||||||
|
>
|
||||||
|
적용
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className="cursor-default text-sm flex justify-center items-center w-full h-7 rounded-none rounded-tr-md! hover:bg-gray-100"
|
||||||
|
>
|
||||||
|
취소
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</PopoverContent>
|
</PopoverContent>
|
||||||
</Popover>
|
</Popover>
|
||||||
<span> - </span>
|
<span> - </span>
|
||||||
@@ -119,15 +131,81 @@ export const TimePickPopover = ({ ...props }: TimePickPopoverProps) => {
|
|||||||
className="border border-indigo-100 bg-white hover:bg-indigo-100 text-black"
|
className="border border-indigo-100 bg-white hover:bg-indigo-100 text-black"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
>
|
>
|
||||||
|
종료 시간 설정
|
||||||
</Button>
|
</Button>
|
||||||
</PopoverTrigger>
|
</PopoverTrigger>
|
||||||
<PopoverContent
|
<PopoverContent
|
||||||
className="w-fit h-fit"
|
className="w-fit h-42 flex flex-row p-0"
|
||||||
align={'end'}
|
align={'end'}
|
||||||
side={popoverAlign === 'start' ? 'bottom' : 'top'}
|
side={popoverAlign === 'start' ? 'bottom' : 'top'}
|
||||||
>
|
>
|
||||||
|
<ToggleGroup
|
||||||
|
type="single"
|
||||||
|
className="w-15 flex flex-col justify-start items-center"
|
||||||
|
>
|
||||||
|
<ToggleGroupItem
|
||||||
|
value={"오전"}
|
||||||
|
className="w-full h-7 rounded-none! rounded-tl-md!"
|
||||||
|
>
|
||||||
|
오전
|
||||||
|
</ToggleGroupItem>
|
||||||
|
<ToggleGroupItem
|
||||||
|
value={"오후"}
|
||||||
|
className="w-full h-7 rounded-none!"
|
||||||
|
>
|
||||||
|
오후
|
||||||
|
</ToggleGroupItem>
|
||||||
|
</ToggleGroup>
|
||||||
|
<ScrollArea
|
||||||
|
className="w-15 h-full"
|
||||||
|
>
|
||||||
|
<ToggleGroup
|
||||||
|
type="single"
|
||||||
|
className="w-15 border-r rounded-none border-l flex flex-col justify-start items-center"
|
||||||
|
>
|
||||||
|
{
|
||||||
|
[1,2,3,4,5,6,7,8,9,10,11,12].map((time) => (
|
||||||
|
<ToggleGroupItem
|
||||||
|
className="w-full h-7 rounded-none!"
|
||||||
|
value={time.toString().padStart(2, '0')}
|
||||||
|
>
|
||||||
|
{time.toString().padStart(2, '0')}
|
||||||
|
</ToggleGroupItem>
|
||||||
|
))
|
||||||
|
}
|
||||||
|
</ToggleGroup>
|
||||||
|
</ScrollArea>
|
||||||
|
<ScrollArea
|
||||||
|
className="w-15 h-full"
|
||||||
|
>
|
||||||
|
<ToggleGroup
|
||||||
|
type="single"
|
||||||
|
className="w-full h-full rounded-none border-r flex flex-col justify-start items-center"
|
||||||
|
>
|
||||||
|
{
|
||||||
|
Array.from({ length: 60 }).map((_, idx) => (
|
||||||
|
<ToggleGroupItem
|
||||||
|
value={idx.toString().padStart(2, '0')}
|
||||||
|
className="w-full h-7 rounded-none!"
|
||||||
|
>
|
||||||
|
{idx.toString().padStart(2, '0')}
|
||||||
|
</ToggleGroupItem>
|
||||||
|
))
|
||||||
|
}
|
||||||
|
</ToggleGroup>
|
||||||
|
</ScrollArea>
|
||||||
|
<div className="w-15 h-full flex flex-col">
|
||||||
|
<div
|
||||||
|
className="cursor-default text-sm flex justify-center items-center w-full h-7 rounded-none rounded-tr-md! hover:bg-gray-100"
|
||||||
|
>
|
||||||
|
적용
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
className="cursor-default text-sm flex justify-center items-center w-full h-7 rounded-none rounded-tr-md! hover:bg-gray-100"
|
||||||
|
>
|
||||||
|
취소
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</PopoverContent>
|
</PopoverContent>
|
||||||
</Popover>
|
</Popover>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ export const TempPage = () => {
|
|||||||
localStorage.setItem('autoLogin', 'false');
|
localStorage.setItem('autoLogin', 'false');
|
||||||
navigate(PageRouting["LOGIN"].path);
|
navigate(PageRouting["LOGIN"].path);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
navigate(PageRouting["LOGIN"].path);
|
||||||
}
|
}
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user