mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-20 14:39:06 +00:00
bugfix: event handler
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import { IconButton } from '@chakra-ui/button';
|
import { IconButton } from '@chakra-ui/button';
|
||||||
import { FiPlus } from "react-icons/fi";
|
import { FiPlus } from 'react-icons/fi';
|
||||||
|
|
||||||
export default function AddIconBtn(props) {
|
export default function AddIconBtn(props) {
|
||||||
return (
|
return (
|
||||||
@@ -7,7 +7,7 @@ export default function AddIconBtn(props) {
|
|||||||
size={props.size || 'xs'}
|
size={props.size || 'xs'}
|
||||||
icon={<FiPlus />}
|
icon={<FiPlus />}
|
||||||
colorScheme='blue'
|
colorScheme='blue'
|
||||||
onClick={() => props.clickHandler}
|
onClick={props.clickHandler}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export default function BlockIconBtn(props) {
|
|||||||
size={props.size || 'xs'}
|
size={props.size || 'xs'}
|
||||||
icon={<FiMinusCircle />}
|
icon={<FiMinusCircle />}
|
||||||
colorScheme='purple'
|
colorScheme='purple'
|
||||||
onClick={() => props.clickHandler}
|
onClick={props.clickHandler}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export default function DelayIconBtn(props) {
|
|||||||
size={props.size || 'xs'}
|
size={props.size || 'xs'}
|
||||||
icon={<FiClock />}
|
icon={<FiClock />}
|
||||||
colorScheme='yellow'
|
colorScheme='yellow'
|
||||||
onClick={() => props.clickHandler}
|
onClick={props.clickHandler}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export default function DeleteIconBtn(props) {
|
|||||||
size={props.size || 'xs'}
|
size={props.size || 'xs'}
|
||||||
icon={<FiMinus />}
|
icon={<FiMinus />}
|
||||||
colorScheme='red'
|
colorScheme='red'
|
||||||
onClick={() => props.clickHandler}
|
onClick={props.clickHandler}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ export default function DelayValue(props) {
|
|||||||
const { delay } = props;
|
const { delay } = props;
|
||||||
const delayed = delay > 0;
|
const delayed = delay > 0;
|
||||||
return (
|
return (
|
||||||
<div className={delayed && style.delayValue}>
|
<div className={delayed ? style.delayValue : undefined}>
|
||||||
{delayed && <span>{`+ ${delay}`}</span>}
|
{delayed && <span>{`+ ${delay}`}</span>}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -37,8 +37,6 @@ export default function EditableTimer(props) {
|
|||||||
setValue(addAndFormat(time, delay));
|
setValue(addAndFormat(time, delay));
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log('hh', value, time);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={style.time}>
|
<div className={style.time}>
|
||||||
<Editable
|
<Editable
|
||||||
|
|||||||
@@ -33,10 +33,18 @@
|
|||||||
transition: linear 0.1s;
|
transition: linear 0.1s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.eventRow:hover > .actionOverlay,
|
||||||
|
.eventRowActive:hover > .actionOverlay,
|
||||||
|
.block:hover > .actionOverlay,
|
||||||
|
.delay:hover > .actionOverlay {
|
||||||
|
opacity: 0.85;
|
||||||
|
transition: linear 0.1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* NA */
|
||||||
.actionOverlay:hover {
|
.actionOverlay:hover {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ============= EVENT ITEM ============= */
|
/* ============= EVENT ITEM ============= */
|
||||||
|
|
||||||
.eventRow,
|
.eventRow,
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import { IconButton } from '@chakra-ui/button';
|
|
||||||
import { AddIcon, MinusIcon } from '@chakra-ui/icons';
|
|
||||||
import AddIconBtn from '../../../common/components/buttons/AddIconBtn';
|
import AddIconBtn from '../../../common/components/buttons/AddIconBtn';
|
||||||
import DeleteIconBtn from '../../../common/components/buttons/DeleteIconBtn';
|
import DeleteIconBtn from '../../../common/components/buttons/DeleteIconBtn';
|
||||||
import style from './Block.module.css';
|
import style from './Block.module.css';
|
||||||
@@ -8,7 +6,7 @@ export default function BlockBlock(props) {
|
|||||||
const { eventsHandler, index, data } = props;
|
const { eventsHandler, index, data } = props;
|
||||||
|
|
||||||
const addHandler = () => {
|
const addHandler = () => {
|
||||||
eventsHandler('add', { type: 'block', order: index + 1 });
|
eventsHandler('add', { type: 'event', order: index + 1 });
|
||||||
};
|
};
|
||||||
const deleteHandler = () => {
|
const deleteHandler = () => {
|
||||||
eventsHandler('delete', data.id);
|
eventsHandler('delete', data.id);
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import { IconButton } from '@chakra-ui/button';
|
|
||||||
import { AddIcon, MinusIcon } from '@chakra-ui/icons';
|
|
||||||
import { Box } from '@chakra-ui/layout';
|
import { Box } from '@chakra-ui/layout';
|
||||||
import {
|
import {
|
||||||
Slider,
|
Slider,
|
||||||
@@ -8,7 +6,6 @@ import {
|
|||||||
SliderTrack,
|
SliderTrack,
|
||||||
} from '@chakra-ui/slider';
|
} from '@chakra-ui/slider';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import style from './List.module.css';
|
|
||||||
import AddIconBtn from '../../../common/components/buttons/AddIconBtn';
|
import AddIconBtn from '../../../common/components/buttons/AddIconBtn';
|
||||||
import DeleteIconBtn from '../../../common/components/buttons/DeleteIconBtn';
|
import DeleteIconBtn from '../../../common/components/buttons/DeleteIconBtn';
|
||||||
import style from './Block.module.css';
|
import style from './Block.module.css';
|
||||||
@@ -34,14 +31,12 @@ export default function DelayBlock(props) {
|
|||||||
setDelay(data.timerDuration);
|
setDelay(data.timerDuration);
|
||||||
}, [data]);
|
}, [data]);
|
||||||
const addHandler = () => {
|
const addHandler = () => {
|
||||||
eventsHandler('add', { type: 'block', order: index + 1 });
|
|
||||||
};
|
};
|
||||||
const deleteHandler = () => {
|
const deleteHandler = () => {
|
||||||
eventsHandler('delete', data.id);
|
eventsHandler('delete', data.id);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={style.delayContainer}>
|
|
||||||
<div className={style.delay}>
|
<div className={style.delay}>
|
||||||
<div className={style.delayValue}>{`${delay} min`}</div>
|
<div className={style.delayValue}>{`${delay} min`}</div>
|
||||||
<Slider
|
<Slider
|
||||||
@@ -59,15 +54,6 @@ export default function DelayBlock(props) {
|
|||||||
<SliderThumb boxSize={4} />
|
<SliderThumb boxSize={4} />
|
||||||
</Slider>
|
</Slider>
|
||||||
<div className={style.actionOverlay}>
|
<div className={style.actionOverlay}>
|
||||||
/>
|
|
||||||
<IconButton
|
|
||||||
size='xs'
|
|
||||||
icon={<AddIcon />}
|
|
||||||
colorScheme='blue'
|
|
||||||
onClick={() =>
|
|
||||||
eventsHandler('add', { type: 'event', order: index + 1 })
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<DeleteIconBtn clickHandler={deleteHandler} />
|
<DeleteIconBtn clickHandler={deleteHandler} />
|
||||||
<AddIconBtn clickHandler={addHandler} />
|
<AddIconBtn clickHandler={addHandler} />
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export default function EventBlock(props) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const addHandler = () => {
|
const addHandler = () => {
|
||||||
eventsHandler('add', { type: 'block', order: index + 1 });
|
eventsHandler('add', { type: 'event', order: index + 1 });
|
||||||
};
|
};
|
||||||
const delayHandler = () => {
|
const delayHandler = () => {
|
||||||
eventsHandler('add', { type: 'delay', order: index + 1 });
|
eventsHandler('add', { type: 'delay', order: index + 1 });
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
import { AddIcon, ChevronDownIcon } from '@chakra-ui/icons';
|
import { FiChevronDown } from 'react-icons/fi';
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
ButtonGroup,
|
ButtonGroup,
|
||||||
IconButton,
|
|
||||||
Menu,
|
Menu,
|
||||||
MenuButton,
|
MenuButton,
|
||||||
MenuItem,
|
MenuItem,
|
||||||
@@ -30,7 +29,7 @@ export default function EventListMenu(props) {
|
|||||||
Upload
|
Upload
|
||||||
</Button>
|
</Button>
|
||||||
<MenuButton as={Button} {...buttonProps}>
|
<MenuButton as={Button} {...buttonProps}>
|
||||||
<ChevronDownIcon />
|
<FiChevronDown />
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
</ButtonGroup>
|
</ButtonGroup>
|
||||||
<MenuList>
|
<MenuList>
|
||||||
@@ -42,7 +41,7 @@ export default function EventListMenu(props) {
|
|||||||
<ButtonGroup isAttached>
|
<ButtonGroup isAttached>
|
||||||
<Button {...buttonProps}>Save</Button>
|
<Button {...buttonProps}>Save</Button>
|
||||||
<MenuButton as={Button} {...buttonProps}>
|
<MenuButton as={Button} {...buttonProps}>
|
||||||
<ChevronDownIcon />
|
<FiChevronDown />
|
||||||
</MenuButton>
|
</MenuButton>
|
||||||
</ButtonGroup>
|
</ButtonGroup>
|
||||||
<MenuList>
|
<MenuList>
|
||||||
|
|||||||
Reference in New Issue
Block a user