mirror of https://github.com/mue/mue.git
feat: move events to section in greeting
- fix no tooltip on remove in todo
This commit is contained in:
parent
36e4ea5e55
commit
a9f3992d2c
|
@ -1,10 +1,21 @@
|
|||
import variables from 'config/variables';
|
||||
import { useState } from 'react';
|
||||
|
||||
import { Header, Row, Content, Action, PreferencesWrapper } from 'components/Layout/Settings';
|
||||
import {
|
||||
Header,
|
||||
Row,
|
||||
Content,
|
||||
Action,
|
||||
PreferencesWrapper,
|
||||
Section,
|
||||
} from 'components/Layout/Settings';
|
||||
import { Checkbox, Switch, Text } from 'components/Form/Settings';
|
||||
|
||||
import { MdEventNote } from 'react-icons/md';
|
||||
|
||||
const GreetingOptions = () => {
|
||||
const [events, setEvents] = useState(false);
|
||||
|
||||
const [birthday, setBirthday] = useState(
|
||||
new Date(localStorage.getItem('birthday')) || new Date(),
|
||||
);
|
||||
|
@ -19,17 +30,12 @@ const GreetingOptions = () => {
|
|||
|
||||
const AdditionalOptions = () => {
|
||||
return (
|
||||
<Row>
|
||||
<Row final={true}>
|
||||
<Content
|
||||
title={variables.getMessage('modals.main.settings.additional_settings')}
|
||||
subtitle={variables.getMessage(`${GREETING_SECTION}.additional`)}
|
||||
/>
|
||||
<Action>
|
||||
<Checkbox
|
||||
name="events"
|
||||
text={variables.getMessage(`${GREETING_SECTION}.events`)}
|
||||
category="greeting"
|
||||
/>
|
||||
<Checkbox
|
||||
name="defaultGreetingMessage"
|
||||
text={variables.getMessage(`${GREETING_SECTION}.default`)}
|
||||
|
@ -79,8 +85,18 @@ const GreetingOptions = () => {
|
|||
);
|
||||
};
|
||||
|
||||
return (
|
||||
<>
|
||||
let header;
|
||||
if (events) {
|
||||
header = (
|
||||
<Header
|
||||
title={variables.getMessage(`${GREETING_SECTION}.title`)}
|
||||
secondaryTitle="Events"
|
||||
goBack={() => setEvents(false)}
|
||||
report={false}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
header = (
|
||||
<Header
|
||||
title={variables.getMessage(`${GREETING_SECTION}.title`)}
|
||||
setting="greeting"
|
||||
|
@ -89,10 +105,37 @@ const GreetingOptions = () => {
|
|||
zoomSetting="zoomGreeting"
|
||||
visibilityToggle={true}
|
||||
/>
|
||||
<PreferencesWrapper setting="greeting" zoomSetting="zoomGreeting" visibilityToggle={true}>
|
||||
<AdditionalOptions />
|
||||
{BirthdayOptions()}
|
||||
</PreferencesWrapper>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
{header}
|
||||
{events ? (
|
||||
<>
|
||||
<Row>
|
||||
<Content title="Events" subtitle="Enable events." />
|
||||
<Action>
|
||||
<Checkbox
|
||||
name="events"
|
||||
text={variables.getMessage(`${GREETING_SECTION}.events`)}
|
||||
category="greeting"
|
||||
/>
|
||||
</Action>
|
||||
</Row>
|
||||
{BirthdayOptions()}
|
||||
</>
|
||||
) : (
|
||||
<PreferencesWrapper setting="greeting" zoomSetting="zoomGreeting" visibilityToggle={true}>
|
||||
<AdditionalOptions />
|
||||
<Section
|
||||
title="Events"
|
||||
subtitle="Control events on Mue such as birthdays."
|
||||
onClick={() => setEvents(true)}
|
||||
icon={<MdEventNote />}
|
||||
/>
|
||||
</PreferencesWrapper>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
|
|
@ -215,7 +215,9 @@ class Todo extends PureComponent {
|
|||
onChange={(data) => this.updateTodo('set', index, data)}
|
||||
readOnly={this.state.todo[index].done}
|
||||
/>
|
||||
<MdDelete onClick={() => this.updateTodo('remove', index)} />
|
||||
<Tooltip title={variables.getMessage('modals.main.marketplace.product.buttons.remove')}>
|
||||
<MdDelete onClick={() => this.updateTodo('remove', index)} />
|
||||
</Tooltip>
|
||||
<SortableHandle />
|
||||
</div>
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue