From f60aae6b245cf8ddfcac3e9c1b66e80955b91852 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Tue, 1 Dec 2020 13:16:13 +0000 Subject: [PATCH] finish birthday feature --- src/components/modals/settings/sections/GreetingSettings.jsx | 3 ++- src/components/widgets/greeting/Greeting.jsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/modals/settings/sections/GreetingSettings.jsx b/src/components/modals/settings/sections/GreetingSettings.jsx index 80c35259..e0986bd6 100644 --- a/src/components/modals/settings/sections/GreetingSettings.jsx +++ b/src/components/modals/settings/sections/GreetingSettings.jsx @@ -28,12 +28,13 @@ export default class GreetingSettings extends React.PureComponent {
+

    {this.props.language.greeting.name} this.resetItem()}>{this.props.language.reset}

    -

    Birthday Date this.changeDate('reset')}>{this.props.language.reset}

    +

    Birthday Date

    this.changeDate(data)} value={this.state.birthday}/>
diff --git a/src/components/widgets/greeting/Greeting.jsx b/src/components/widgets/greeting/Greeting.jsx index 355fd05b..abecabc3 100644 --- a/src/components/widgets/greeting/Greeting.jsx +++ b/src/components/widgets/greeting/Greeting.jsx @@ -49,7 +49,7 @@ export default class Greeting extends React.PureComponent { // Birthday const birth = new Date(localStorage.getItem('birthday')); - if (birth.getDate() === now.getDate() && birth.getMonth() === now.getMonth() && birth.getFullYear() !== 1001) message = 'Happy Birthday'; + if (localStorage.getItem('birthdayenabled') === 'true' && birth.getDate() === now.getDate() && birth.getMonth() === now.getMonth()) message = 'Happy Birthday'; // Set the state to the greeting string this.setState({ greeting: `${message}${name}` });